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

This reverts commit fc8c8cf806a653047790d9311f1ba5aead174a31.
Rebase from 'upstream' @ version '0.3.21'
Trimmed the branch to only the moveit_ros sub directory