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

This reverts commit ed06d3b53565b8cef7f6bbd98c5ab32d5ed4aac7.
Rebase from 'upstream'
Trimmed the branch to only the motoman sub directory