Don't remove upload items unless explicitly requested.
Merge pull request #5527 from jdfreder/i5518

Don't remove upload items from nav tree unless explicitly requested.