ACCUMULO-2842 Mention hflush as an alternative configuration for the property
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

Conflicts:
	core/src/main/java/org/apache/accumulo/core/conf/Property.java
Merge branch '1.6.1-SNAPSHOT'