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

This reverts commit 4638185355fe2107dede15b705facce936370b18.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the joint_state_controller sub directory