Temporarily disable bulk operations b/c old mongo
does too much work on exit and doesn't handle nesting
Update mongo counts.
remove course-id visual column from the list of coupons as it's useless information here and prevents overflows from happening
don't hard code the shoppingcart order confirmation page to use settings.xxx, allow for microsites to override
Merge pull request #5084 from edx/hotfix/2014-09-04b

Tmporarily disable bulk operations b/c old mongo
escape html for inline discussions (TNL-182)
Merge pull request #5095 from edx/cdodge/white-label-small-hotfixes

Cdodge/white label small hotfixes
Merge pull request #5098 from edx/adam/forums-script-escape

escape html for inline discussions (TNL-182)
Merge pull request #5097 from edx/hotfix/2014-09-05b

Hotfix/2014 09 05b
Merge remote-tracking branch 'origin/release' into adam/resolve-merge-conflicts

Conflicts:
	common/lib/xmodule/xmodule/modulestore/tests/test_mixed_modulestore.py
Update mongo count.
Merge pull request #5107 from edx/adam/resolve-merge-conflicts

Adam/resolve merge conflicts
Cache inherited settings outside of structure
LMS-11363
Add paver arguments for default store for lettuce acceptance testing (LMS-11211); default store set to Draft.
update_module_store_settings for default store in Acceptance and BokChoy tests.
Paver Bokchoy support for Split; default store set to Split.
Fix split bokchoy tests.
Fix bokchoy tests; Make auth check branch agnostic