Make sure that Panopoly Demo is enabled when rolling back demo content
Merge branch '7.x-1.x' of https://github.com/vih/vih_demo into 7.x-1.x