OPENUCB-245 and related tickets: Updating Panopoly 1.1 - merge to master (see comments)

IST Drupal Team: Do not apply to sites until checking with team. Will require db sql fix, updb, and configuration.