Updating Panopoly Core for #1840880 - Reduce Reliance on Panopoly Core, but Moving Make File Considerations Here