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

This reverts commit ff97cf245260002c1d5699cabf427c5b99c7f45d.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the joint_trajectory_generator sub directory