Updated props for more sensible default

USERGRID-753