Merge records #client and #transport esl/escalus#24