[DO NOT MERGE -- WIP] Advertise service cleanup

Cleanup of advertise service protocol as noted in https://github.com/RobotWebTools/rosbridge_suite/issues/142