fixing geometric_shapes source branch re #5060
fixing image_transport_plugins source and doc branch re #5060
fixing laser_filters doc branch re #5060 @jonbinney @vrabaud
fixing nodelet_core doc branch re #5060 @esteve
Merge pull request #5067 from ros/fix_5060

Fix 5060 doc and source branches

fixes #5060