fixing some scenarios
adding marketplace/root level resource
Merge remote-tracking branch 'mj/revision1' into rev1
Merge remote-tracking branch 'matthewfl/rev1' into revision1