Switch to upstream openocd config

Pushed my changes to OpenOCD here:
http://openocd.zylin.com/#/c/2089/