Finish merge of adaptivecomputing/4.2.0 to actorquedeveloper/4.2.0