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

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