Internal SQLA Storage Consistency Cleanup

This will make adding paging support for all resources simpler, and
much more DRY.

Change-Id: I5a3c4e05a8565057066d98525e4c074a52a6b015
Merge "Internal SQLA Storage Consistency Cleanup"