Update JSON SerDe for CDH5

Sorry for the multiple PR's. This should be top of HEAD develop.