Fix browsing of orphaned container. (see #11089)
Clean up code and remove whitespace.
Fix indent
Merge pull request #1279 from jburel/orphan-folder-dev_4_4

Orphan folder dev 4 4