Pulling hydro-devel changes into hydro branch

The hydro-devel branch was tested in ROS-Industrial training class.  Minus a few minor issues, everything worked.