CONN-1278: Resolved rebase conflict, completed X12 Adapter code