Update Panopoly Core and Test for #2283223 by caschbre, dsnopek | carsonblack: Fixed Old content aliases should be preserved by default.