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

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