rtt_actionlib: fixing bad merge