Don't list sardine 5.1
remove sardine 5.1
Merge branch 'core' into enterprise

Conflicts:
	src/main/resources/plugins/plugins.xml