Rebase 20140926 merged xblock discussion changes

Merged discussion changes, resolved conflicts, fixed broken tests
I'm not sure if it's a standard/convention, but I've noticed a pattern where settings/features are defined, but disabled, in common.py, and then the settings/features are enabled in either lms.auth.json or lms.env.json -- @antoviaque, what do you think?