fixed multimap migration issue, increased master confirmation second to 500
Merge branch '3.1.8' of github.com:hazelcast/hazelcast into 3.1.8-hostaware

Conflicts:
	hazelcast/src/main/java/com/hazelcast/multimap/MultiMapService.java