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

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