Intermediate commit.  Need to merge master

USERGRID-1391