GRP-1016: New UI has inconsistent language stem vs folder
Merge branch 'master' of https://github.com/Internet2/grouper

Conflicts:
	grouper-ui/conf/grouperText/grouper.text.en.us.base.properties