findbugs fix
merge
merge
merging

Conflicts:
	hazelcast/src/main/java/com/hazelcast/map/DefaultRecordStore.java
minor review changes
minor review changes 2
refactorings & cleanup
remove volatile
Merge pull request #2216 from ahmetmircik/maintenance/evictionImprovement2

Fixes #1600 : (maintenance) LRU & LFU map eviction now works when statistics are disabled