Fix snapshot.aware_tstamp by converting from utc timestamp
Merge pull request #309 from mvantellingen/fix-timestamps

Fix snapshot.aware_tstamp by converting from utc timestamp