Added retry on scan fail (due to long pauses between two consecutive
nextRecord())
Merge branch 'master' of
https://github.com/fpompermaier/incubator-flink.git

Conflicts:
	flink-addons/flink-hbase/src/main/java/org/apache/flink/addons/hbase/TableInputFormat.java