Merged #2485 pull-request into current master.

Conflicts:
	hazelcast-documentation/documentation.index
	hazelcast/src/test/java/com/hazelcast/config/XMLConfigBuilderTest.java