Update ompl to explicitly use python2, re-add package.xml, update moveit_planners metapackage