USERGRID-2 package namespace to org.apache.usergrid