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

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