Merge remote-tracking branch 'origin/milestone2' into milestone2

Conflicts:
	src/test/java/com/rightmove/es/service/PropertySearchServiceTest.java