Deactivate plugin test changes
Merge branch 'master' of https://github.com/europeana/uim-europeana

Conflicts:
	workflow_plugins/deactivate/src/test/java/eu/europeana/europeanauim/DeactivatePluginTest.java