ObjectStoreModel fixes for asynchronous stores.
Added async tests to Tree_ObjectStoreModel.html, and lots of cleanup too.

Refs #17836, fixes #17837.