minor bugfix when identifying the approach state in manipulation; propagate changes from moveit_core for fixing warnings