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

This reverts commit 8cb15fafb105722d4968159129e3365bb0e144c2.
Rebase from 'upstream'
Trimmed the branch to only the joint_state_controller sub directory