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

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