JBEHAVE-977:  Cleanup of Resource object and uploaders.