Revert "Merge branch 'master' into Updates"

This reverts commit 19023c85b6b949aaab3bd099b431cc4bcaa0b523, reversing
changes made to da8bb3667c9e41b9aa2d5a156df4feb28ffa3178.

Conflicts:
	sites/all/modules/context/context.core.inc
	sites/all/modules/context/context.info
	sites/all/modules/context/context.plugins.inc
	sites/all/modules/context/context_layouts/context_layouts.info
	sites/all/modules/context/context_ui/context_ui.info
	sites/all/modules/context/context_ui/tests/context_ui.test
	sites/all/modules/context/plugins/context_reaction_block.inc
	sites/all/modules/context/plugins/context_reaction_breadcrumb.inc
	sites/all/modules/context/plugins/context_reaction_menu.inc