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

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