cleanup duplication between original and 1.2 encoder
add back context and mdc property support to 1.2 encoder
adapt tests for 1.2 encoder