Go back to using TRAIN-TIMESTAMP for the sequence number.  I think this
will work now.
Merge branch 'master' of gitserver.ixsystems.com:/git/repos/freenas-build/freenas