Merge branch 'master' of github.com:VoltDB/voltdb into ENG-4697-to-timestamp
bug fix, change the return type of since_epoch from int to bigint
Merge branch 'ENG-4697-to-timestamp' of github.com:VoltDB/voltdb into ENG-4697-to-timestamp