cleanup unnecessary classes and use Java constant convention for logger
Merge branch 'USERGRID-1861' of https://github.com/apigee/usergrid-stack into USERGRID-1861
Merge branch 'USERGRID-1861' of https://github.com/apigee/usergrid-stack into USERGRID-1861