Fix collision of connector_plate#50

awesome-manuel wants to merge 1 commit intoRethinkRobotics:masterRethinkRobotics/intera_common:masterfrom

awesome-manuel:connector-plateawesome-manuel/intera_common:connector-plateCopy head branch name to clipboard