Fixing catalog listing/instantating from REST via yaml

@sjcorbett @neykov can you review please.

I'm still investigating + fixing why running all the tests in a row fails.
Yes.

Tested it and it is currently broken. Shouldn't be too hard to fix, will try it.