Merge hydro-devel to master

We have not been good a committing changes and fixes to just one branch :)

This should fix this issue https://github.com/ros-controls/ros_controllers/pull/27

@adolfo-rt