issue 803
issue 803
issue 615
issue 803 fix comment
issue 803
issue 803
issue 615
issue 615
issue 803 add new methods of LocalMapStats to MapMBean
issue 803 remove getBackupHeapCost
issue 803 remove method getBackupHeapCost
issue 803 remove method  LocalMapStats :: getBackupHeapCost
Merge branch 'test' of https://github.com/ahmetmircik/hazelcast

Conflicts:
	hazelcast/src/main/java/com/hazelcast/map/tx/TransactionalMapProxy.java
	hazelcast/src/main/java/com/hazelcast/map/tx/TransactionalMapProxySupport.java
	hazelcast/src/main/java/com/hazelcast/monitor/LocalMapStats.java
	hazelcast/src/test/java/com/hazelcast/map/MapTransactionTest.java
Merge remote-tracking branch 'origin/master'