Merge "New appengine facet configuration persistence." into idea133