map try remove fix
Merge remote-tracking branch 'origin/3.0' into 3.0

Conflicts:
	hazelcast/src/test/java/com/hazelcast/map/BaseTest.java
	hazelcast/src/test/java/com/hazelcast/map/ClusterBackupTest.java
	hazelcast/src/test/java/com/hazelcast/map/DataOverHeadTest.java
	hazelcast/src/test/java/com/hazelcast/map/DynamicClusterTest.java
	hazelcast/src/test/java/com/hazelcast/map/HazelcastTest.java
	hazelcast/src/test/java/com/hazelcast/map/MapBackupTest.java
	hazelcast/src/test/java/com/hazelcast/map/MapDeathTest.java
	hazelcast/src/test/java/com/hazelcast/map/MapEntryListenerTest.java
	hazelcast/src/test/java/com/hazelcast/map/MapEvictionTest.java
	hazelcast/src/test/java/com/hazelcast/map/MapLoaderTest.java
	hazelcast/src/test/java/com/hazelcast/map/MapLocalStatsTest.java
	hazelcast/src/test/java/com/hazelcast/map/MapMergeTest.java
	hazelcast/src/test/java/com/hazelcast/map/MapTest.java
	hazelcast/src/test/java/com/hazelcast/map/MapTransactionTest.java
	hazelcast/src/test/java/com/hazelcast/map/SimpleLocalMapTest.java
	hazelcast/src/test/java/com/hazelcast/map/old/BaseTest.java
	hazelcast/src/test/java/com/hazelcast/map/old/ClusterBackupTest.java
	hazelcast/src/test/java/com/hazelcast/map/old/DataOverHeadTest.java
	hazelcast/src/test/java/com/hazelcast/map/old/DynamicClusterTest.java
	hazelcast/src/test/java/com/hazelcast/map/old/HazelcastTest.java
	hazelcast/src/test/java/com/hazelcast/map/old/MapBackupTest.java
	hazelcast/src/test/java/com/hazelcast/map/old/MapDeathTest.java
	hazelcast/src/test/java/com/hazelcast/map/old/MapEntryListenerTest.java
	hazelcast/src/test/java/com/hazelcast/map/old/MapEvictionTest.java
	hazelcast/src/test/java/com/hazelcast/map/old/MapLoaderTest.java
	hazelcast/src/test/java/com/hazelcast/map/old/MapLocalStatsTest.java
	hazelcast/src/test/java/com/hazelcast/map/old/MapMergeTest.java
	hazelcast/src/test/java/com/hazelcast/map/old/MapTest.java
	hazelcast/src/test/java/com/hazelcast/map/old/MapTransactionTest.java
	hazelcast/src/test/java/com/hazelcast/map/old/SimpleLocalMapTest.java
	hazelcast/src/test/java/com/hazelcast/map/test/BaseTest.java
	hazelcast/src/test/java/com/hazelcast/map/test/ClusterBackupTest.java
	hazelcast/src/test/java/com/hazelcast/map/test/DataOverHeadTest.java
	hazelcast/src/test/java/com/hazelcast/map/test/DynamicClusterTest.java
	hazelcast/src/test/java/com/hazelcast/map/test/HazelcastTest.java
	hazelcast/src/test/java/com/hazelcast/map/test/MapBackupTest.java
	hazelcast/src/test/java/com/hazelcast/map/test/MapDeathTest.java
	hazelcast/src/test/java/com/hazelcast/map/test/MapEntryListenerTest.java
	hazelcast/src/test/java/com/hazelcast/map/test/MapEvictionTest.java
	hazelcast/src/test/java/com/hazelcast/map/test/MapLoaderTest.java
	hazelcast/src/test/java/com/hazelcast/map/test/MapLocalStatsTest.java
	hazelcast/src/test/java/com/hazelcast/map/test/MapMergeTest.java
	hazelcast/src/test/java/com/hazelcast/map/test/MapTest.java
	hazelcast/src/test/java/com/hazelcast/map/test/MapTransactionTest.java
	hazelcast/src/test/java/com/hazelcast/map/test/SimpleLocalMapTest.java
Merge branch '3.0' of https://github.com/hazelcast/hazelcast into 3.0

Conflicts:
	hazelcast/src/test/java/com/hazelcast/concurrent/countdownlatch/CountDownLatchTest.java
	hazelcast/src/test/java/com/hazelcast/instance/StaticNodeFactory.java
Merge remote-tracking branch 'origin/3.0' into 3.0

Conflicts:
	hazelcast/src/test/java/com/hazelcast/map/BaseTest.java
	hazelcast/src/test/java/com/hazelcast/map/ClusterBackupTest.java
	hazelcast/src/test/java/com/hazelcast/map/DataOverHeadTest.java
	hazelcast/src/test/java/com/hazelcast/map/DynamicClusterTest.java
	hazelcast/src/test/java/com/hazelcast/map/HazelcastTest.java
	hazelcast/src/test/java/com/hazelcast/map/MapBackupTest.java
	hazelcast/src/test/java/com/hazelcast/map/MapDeathTest.java
	hazelcast/src/test/java/com/hazelcast/map/MapEntryListenerTest.java
	hazelcast/src/test/java/com/hazelcast/map/MapEvictionTest.java
	hazelcast/src/test/java/com/hazelcast/map/MapLoaderTest.java
	hazelcast/src/test/java/com/hazelcast/map/MapLocalStatsTest.java
	hazelcast/src/test/java/com/hazelcast/map/MapMergeTest.java
	hazelcast/src/test/java/com/hazelcast/map/MapTest.java
	hazelcast/src/test/java/com/hazelcast/map/MapTransactionTest.java
	hazelcast/src/test/java/com/hazelcast/map/SimpleLocalMapTest.java
	hazelcast/src/test/java/com/hazelcast/map/old/BaseTest.java
	hazelcast/src/test/java/com/hazelcast/map/old/ClusterBackupTest.java
	hazelcast/src/test/java/com/hazelcast/map/old/DataOverHeadTest.java
	hazelcast/src/test/java/com/hazelcast/map/old/DynamicClusterTest.java
	hazelcast/src/test/java/com/hazelcast/map/old/HazelcastTest.java
	hazelcast/src/test/java/com/hazelcast/map/old/MapBackupTest.java
	hazelcast/src/test/java/com/hazelcast/map/old/MapDeathTest.java
	hazelcast/src/test/java/com/hazelcast/map/old/MapEntryListenerTest.java
	hazelcast/src/test/java/com/hazelcast/map/old/MapEvictionTest.java
	hazelcast/src/test/java/com/hazelcast/map/old/MapLoaderTest.java
	hazelcast/src/test/java/com/hazelcast/map/old/MapLocalStatsTest.java
	hazelcast/src/test/java/com/hazelcast/map/old/MapMergeTest.java
	hazelcast/src/test/java/com/hazelcast/map/old/MapTest.java
	hazelcast/src/test/java/com/hazelcast/map/old/MapTransactionTest.java
	hazelcast/src/test/java/com/hazelcast/map/old/SimpleLocalMapTest.java
	hazelcast/src/test/java/com/hazelcast/map/test/BaseTest.java
	hazelcast/src/test/java/com/hazelcast/map/test/ClusterBackupTest.java
	hazelcast/src/test/java/com/hazelcast/map/test/DataOverHeadTest.java
	hazelcast/src/test/java/com/hazelcast/map/test/DynamicClusterTest.java
	hazelcast/src/test/java/com/hazelcast/map/test/HazelcastTest.java
	hazelcast/src/test/java/com/hazelcast/map/test/MapBackupTest.java
	hazelcast/src/test/java/com/hazelcast/map/test/MapDeathTest.java
	hazelcast/src/test/java/com/hazelcast/map/test/MapEntryListenerTest.java
	hazelcast/src/test/java/com/hazelcast/map/test/MapEvictionTest.java
	hazelcast/src/test/java/com/hazelcast/map/test/MapLoaderTest.java
	hazelcast/src/test/java/com/hazelcast/map/test/MapLocalStatsTest.java
	hazelcast/src/test/java/com/hazelcast/map/test/MapMergeTest.java
	hazelcast/src/test/java/com/hazelcast/map/test/MapTest.java
	hazelcast/src/test/java/com/hazelcast/map/test/MapTransactionTest.java
	hazelcast/src/test/java/com/hazelcast/map/test/SimpleLocalMapTest.java