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

This reverts commit 00e7af4877208e9c5fe972bd2c4e57b460529676.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the catkinize_this sub directory