[FLINK-827-FIX] and rebase with current master
Merge branch 'FLINK-827-FIX' of https://github.com/tobwiens/incubator-flink into FLINK-827-FIX