ACCUMULO-3237 stricter thrift version checking
Merge branch '1.6'

Conflicts:
	core/src/main/scripts/generate-thrift.sh