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

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