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

This reverts commit 48c9b99f9ff690435a50fb741b4a1c8a7ca59fa9.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the joint_trajectory_controller sub directory