Switched to  latest panopoly integration branch make file
Update core to 7.18