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

This reverts commit 792e40f279f02f99f84dd0b9e94ea214ad165ef7.
Rebase from 'upstream'
Trimmed the branch to only the joint_trajectory_controller sub directory