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

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