compress logic into one line
Fix issue with management command data storage

So this was storing a quoted string, which is apparently sometimes a
problem.
add better method for handling template switching based on bootstrap version
Merge pull request #4118 from dimagi/management-command-fix

Fix issue with management command data storage
Merge branch 'master' into vellum-requirejs

Conflicts:
	submodules/formdesigner
Merge branch 'master' into vellum-requirejs+bootstrap3-stylin

Conflicts:
	submodules/formdesigner
Merge remote-tracking branch 'origin/explicit_case_processing' into autostaging
Merge remote-tracking branch 'origin/auto-gps+schedule' into autostaging
Merge remote-tracking branch 'origin/auto-gps' into autostaging
Merge remote-tracking branch 'origin/schedule' into autostaging
Merge branch 'active_domain' into autostaging
Merge branch 'commconnect-reports' into autostaging
Merge remote-tracking branch 'origin/hq-dropdown' into autostaging
Merge remote-tracking branch 'origin/refactor-domain-copy2' into autostaging
Merge remote-tracking branch 'origin/logos' into autostaging
Merge branch 'vellum-requirejs' into autostaging
Merge remote-tracking branch 'origin/emwf-refactor' into autostaging
Merge branch 'admin-reports' into autostaging
Merge remote-tracking branch 'origin/archive-to-deactivate' into autostaging
Merge remote-tracking branch 'origin/opm' into autostaging