Fix need for downstream dependency on OGRE, #733.
Add workaround for rviz/#734