In the past Raspberry Fondation was refering to their own branch, but when I last checked this was gone and instead they point the user to official 0.12 release of openocd.
So I followed their advice and ended up in debugging hell.....
Really hope that they fix this/get their fix accepted by openocd in an upcoming release.....
Michael