Commit 2b92fad7804791e1a20f46acf637ff4c40470e50

Stefan Sperling 2019-06-02T17:52:19

test and fix expected file status after 'got cherrypick'