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

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