Merge pull request #12317 from nashby/collection-label-namespace

handle `:namespace` form option in collection labels
Conflicts:
	actionview/CHANGELOG.md