Cleanup of Items and ContentLocators
More junk removal.

Removed code marked as "junkyard"
Merge pull request #111 from sonatype/nexus-5790-new-content-impl-2

NEXUS-5790: New content resource implementation, part II