More JSON serialization fixes: EntityRef and CredentialsInfo should not be serialized with type info.
Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o

Conflicts:
	stack/corepersistence/common/src/test/resources/log4j.properties