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

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