Adding Jackson annotations to be compatible with Jackson 1.9 due to behavior change since 1.8