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

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