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

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