Improved timestamp parsing with more default options, including support for plain long String values represents ms since epoch and changed that to be the default for hidden Timestamp string values; this fixes an issue recently introduced related to time zones and Timestamp type primary key fields
Merge remote-tracking branch 'upstream/master'