AS7-6673 Clean out deprecated OperationContext stuff

also AS7-6661 OperationClientException fixes