Revert "Trimmed the branch to only the catkinize_this sub directory"

This reverts commit aa4a48f1da0b558a84efba7134c70d87f03958d2.
Rebase from 'upstream'
Trimmed the branch to only the catkinize_this sub directory