Set root api url to marketplace server; needed for testing with marketplace
Revert to using local data for loading APIs
Merge branch 'master' into feature-apiReadyQueue