Upgrade Django CSP; bug 989121
Add env var for RABBIT_HOST (bug 1083690)
Bump app-validator (bug 1087653)
Merge pull request #2659 from clouserw/989121

Upgrade Django CSP; bug 989121
log fxa changes
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)
Include waffle switches and FxA stuff in commonplace index.html (bug 1093584)
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)
generate proper Contribution for zippy (bug 1091021)
Added some logging and statsd timing (bug 1088329)