Project: usergrid
Issue USERGRID-560: Ensure USERGRID-530 is addressed in two-dot-o(-dev)
https://issues.apache.org/jira/browse/USERGRID-530. Make sure it gets in 2.0
Story points: 3