Move property roles to correct locations, adding Hystrix property file config.properties, better ensure consistent usage of COLLECTION_SUFFIX.
Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into two-dot-o
Ensure consistent usage of edge connection type, fix duplicate property value tests.