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

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