Updating Panopoly Core for #2062377: Update features to 2.0