Move youview.upload.enabled check to somewhere more sensible, to prevent loading of module even when yv upload isn't enabled.
Merge branch 'mbst-4791-lovefilm-deletes' into stage

Conflicts:
	src/main/java/org/atlasapi/ConfigurableAnnotationWebApplicationContext.java