Patch Set 1:

sorry, I missed to explain what I did: 

This change has the wrong base e11af568285525f4d16bbefef5faae5fea2ef008 "Merge branch 'stable-1.2'" which is only reachable from master but not from stable-1.2 but you pushed this change to stable-1.2. Hence to fix this I cherry-picked this change onto current stable-1.2 and then I end up with the mentioned two errors.