Replace calls to _queryAsJSON to _simpleQuery

This drops most instances of retrying
Rename _simpleQuery to _contentQuery

It queries the content column!
Add missing vars in catalog-remote.js
Eliminate _queryWithRetry
Drop refresh logic around constraint solver