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

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