render_model and render_model_block elements are not hidden in structure mode
Fix tests
fixes issue #2576
Merge pull request #2719 from FinalAngel/fixes/2576

fixes issue #2576
Merge pull request #2715 from yakky/feature/fix_2710_2

render_model and render_model_block elements are not hidden in structure mode
Added missing spaces in deprecation warning.
Merge pull request #2727 from timgraham/missing_spaces

Added missing spaces in deprecation warning.
Merge branch 'develop' into fix-2514
Merge branch 'develop' into fix-2514

Conflicts:
	cms/tests/toolbar.py