Changed to two cores in attempt to get build time below 50 min threshold
Merge branch 'hydro-devel' of https://github.com/ros-planning/moveit_core into hydro-devel