Merge pull request #2700 from andymckay/log-fxa

log fxa changes
Allow users with operator shelf permissions to un/publish their operator shelves.
Merge pull request #2701 from chuckharmston/feed_shelf_publish_perms

Allow users with operator shelf permissions to un/publish their operator shelves.
Ensure that attempts to publish operator shelves use object-level permissions.
Merge pull request #2702 from chuckharmston/feed_shelf_publish_perms

Ensure that attempts to publish operator shelves use object-level permissions.
count threads rather than versions (bug 1090436)
Trim down site_config when serializer=commonplace (bug 1093590)
Merge pull request #2704 from diox/remove-flags-from-site-config

Trim down site_config when serializer=commonplace (bug 1093590)
load prices from dev by default, since that uses zippy
Merge pull request #2707 from andymckay/dev-default

load prices from dev by default, since that uses zippy
fix string quotes, oops
remove docker fireplace development lines from commonplace template (bug 1073617)