The REMOVE VERSION macro in the BES tests needs to be updated to correctly remove `-test-deploy`

[jgallagher59701]

The REMOVE VERSION macro in the BES tests needs to be updated to correctly remove -test-deploy

Travis failed with the gateway tests related to [test.opendap.org](http://test.opendap.org/). See https://app.travis-ci.com/github/OPENDAP/bes/jobs/638950147; see
  6: gateway/fnoc1.nc.dods.das.bescmd                ok
  7: gateway/fnoc1.nc.dods.dds.bescmd                ok
  2: gateway/fnoc1.nc.nc.dds.bescmd                  ok
  1: gateway/fnoc1.nc.nc.das.bescmd                  FAILED (testsuite.at:7)
  4: gateway/fnoc1.nc.nc.dmr.bescmd                  FAILED (testsuite.at:11)
  3: gateway/fnoc1.nc.nc.dods.bescmd                 ok
  5: gateway/fnoc1.nc.nc.dap.bescmd                  FAILED (testsuite.at:14)
  8: gateway/fnoc1.nc.dods.dods.bescmd               ok
  9: gateway/fnoc1.nc.dap.dmr.bescmd                 ok
 13: gateway/test_streaming2_dods.bescmd             ok
 12: gateway/test_streaming2.bescmd                  ok
 11: gateway/test_streaming.bescmd                   ok
 14: gateway/test_streaming2_dap.bescmd              ok
 10: gateway/fnoc1.nc.dap.dap.bescmd                 ok

## ------------- ##
## Test results. ##
## ------------- ##

ERROR: All 14 tests were run,
3 failed unexpectedly.
## -------------------------- ##
## testsuite.log was created. ##
## -------------------------- ##

Please send `modules/gateway_module/tests/testsuite.log' and all information you think might help:

   To: <support@opendap.org>
   Subject: [bes 3.21.1] testsuite: 1 4 5 failedI obtained the log from AWS, the error is +31c31
+<         String history "removed date-timehyrax-removed_version http://test.opendap.org/opendap/data/nc/fnoc1.nc.nc
+---
+>         String history "removed date-timehyrax-removed_version-test-deploy http://test.opendap.org/opendap/data/nc/fnoc1.nc.nc   Note: somehow -test-deploy was added to the history or rather the remove-version macro may have issues.