Merge remote-tracking branch 'origin/master'

Conflicts:
	off-heap/pom.xml
	off-heap/src/main/java/org/infinispan/offheap/container/OffHeapDataContainer.java
	off-heap/src/main/java/org/infinispan/offheap/container/OffHeapDefaultDataContainer.java
	off-heap/src/test/java/org/infinispan/offheap/OffHeapDefaultDataContainerTest.java