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

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