508 jackson 2.1.x

Updates to support Jackson 2.1.x as outlined in #508