CONN-355:Undo AdapterPolicyEngineOrchProxyJavaImpl.java changes