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

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