Fix entity metadata "sets" (for Users and Groups) to reference "roles" rather than "rolenames" (https://apigeesc.atlassian.net/browse/USERGRID-1727).
Merge branch 'master' of https://github.com/apigee/usergrid-stack
Revert "Fix entity metadata "sets" (for Users and Groups) to reference "roles" rather than "rolenames" (https://apigeesc.atlassian.net/browse/USERGRID-1727)."

This reverts commit 6bc56a8789bdf5f8ecd716b1c9d93a2ff2fc8756.
Fix for "usergrid-config.properties Not recognized in classpath"
https://apigeesc.atlassian.net/browse/USERGRID-2232