BAMPFA-79: Remove calls to Date.getScalarValue(), since it was refactored away.
Merge branch 'cspace-deployment_4.0' into ucjeps_4.0