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

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