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

This reverts commit ec22e1fa3be2aa9820b3cba3f47682f97db5ca05.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the joint_state_controller sub directory