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

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