branching pr2_doors-1.4 and try to fix for diamondback