PROTL-16: Internal Error Failed to create or upgrade OLR

For upgrading Operating System from OL5 to OL7, we need to reinstall OS. Because GI was upgraded from 11.2.0.3 to 11.2.0.4, we are following traditional deleteNode/addNode approach from MOS Note 1559762.1

When trying addNode, I am getting Bug described in MOS Note 1625104.1.

2014-02-13 16:13:06: Executing cmd: /u02/app/11.2.0.4/grid/bin/ocrconfig -local -upgrade oragrid oinstall
2014-02-13 16:13:06: Command output:
>  PROTL-16: Internal Error

Unfortunately Patch 10125207 conflicts with OCW PSU July 2016.

Is there a workaround?

Best regards

Martin