Changes for rev1
Fix merge problems
Update URIs for v1
Fix guest user process
Fix URL matcher for pulling out marketplace ID to work with rev1 URIs