I spent hours and hours trying to bisect and find the problematic commit, but I simply do not get it. git-merge sucks. However I've built v4.9-rc6 and it is fixed there.