CBD-924:  fixup date calculation

Change-Id: I641e4be97777c54214cfc76c6e1b69e2ef25fa17