Merge pull request #4099 from jreback/hdf_tz

BUG: GH4098, HDFStore not recreating a datetime index properly when has a timezone
BUG: (GH 4096) block ordering is somewhat non-deterministic in HDFStore, so reorder to the existing store

     if needed