24433 - merge to staging from master

The api now serializes the stores into a string and the app deserializes
them back to json objects (avoids having to deal with $ref circular
reference issues)