Expected exception for a bad setting value changed from 2.1
Merge remote-tracking branch 'upstream/2.1-maint'

Conflicts:
	enterprise/ha/src/test/java/org/neo4j/ha/upgrade/RollingUpgradeIT.java