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

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