WFE-1183 PreservationJob NPE fixex
Merge branch 'develop' of github.com:wf4ever/rodl into develop

Conflicts:
	src/test/resources/hibernate.cfg.xml