CONN-355:Undo Changes for AdapterPolicyEngineOrchProxyJavaImp