Merge branch 'master' into beta

Conflicts:
	packages/ember-handlebars/tests/helpers/group_test.js
	packages/ember-handlebars/tests/helpers/if_unless_test.js
Update feature flags for 1.10.