#1014: correctly format cycle point env vars
#1014: remove redundant rm
Merge pull request #1020 from benfitzpatrick/1014.initial-final-cycle-point-env-tz

#1014: correctly format cycle point env vars