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

This reverts commit 1000648a4d19e228d8ed521ce8ba1dd7123b8a3b.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the position_controllers sub directory