Cleanup some things after removal of joda-time hack#18959

rmuir wants to merge 3 commits intoelastic:masterelastic/elasticsearch:masterfrom

rmuir:datetime_cleanuprmuir/elasticsearch:datetime_cleanupCopy head branch name to clipboard