Compliance with new nao-ros commits