Merge pull request #1 from gavanderhoorn/groovy-devel

Merge private development branch
update moveit_configs to use moveit_simple_controller_manager
Merge pull request #2 from ros-industrial/issue2_ctrlMgr

MoveIt configs still use Pr2MoveItControllerManager