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

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