Syncing changes between ros-industrial and master

Changes were made to the ros-industrial branch that should have been made on the master branch.  The ros-industrial branch is for changes specific to ros-industrial.  General changes to build scripts can/should be made on the master branch as all projects would benefit from them.