fix nasty looping problem when calculating complete_result_document for an owned container
Merge branch 'master' into nohttpschemeinurls
setupshop now showing catalog