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

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