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

This reverts commit b32e4bb3c7e08aa1e326a7d237c71ebe135b2179.
Rebase from 'upstream'
Trimmed the branch to only the position_controllers sub directory