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

This reverts commit 496720661c8302babaea198da22a144ca18fc280.
Rebase from 'upstream'
Trimmed the branch to only the catkinize_this sub directory