Modify cli/server products to use Tycho calculated versions
diff --git a/server/releng/org.eclipse.hawk.service.cli.product/pom.xml b/server/releng/org.eclipse.hawk.service.cli.product/pom.xml
index d9aa08f..5c65b9a 100644
--- a/server/releng/org.eclipse.hawk.service.cli.product/pom.xml
+++ b/server/releng/org.eclipse.hawk.service.cli.product/pom.xml
@@ -33,8 +33,8 @@
 					<products>
 						<product>
 							<id>org.eclipse.hawk.service.cli.product</id>
-							<archiveFileName>hawk-cli_${maven.build.timestamp}</archiveFileName>
-							<rootFolder>hawk-cli_${maven.build.timestamp}</rootFolder>
+							<archiveFileName>hawk-cli_${qualifiedVersion}</archiveFileName>
+							<rootFolder>hawk-cli_${qualifiedVersion}</rootFolder>
 						</product>
 					</products>
 				</configuration>
diff --git a/server/releng/org.eclipse.hawk.service.server.product/pom.xml b/server/releng/org.eclipse.hawk.service.server.product/pom.xml
index ea7cf0c..7c3352c 100644
--- a/server/releng/org.eclipse.hawk.service.server.product/pom.xml
+++ b/server/releng/org.eclipse.hawk.service.server.product/pom.xml
@@ -39,8 +39,8 @@
 	    <product>
 	      <id>org.eclipse.hawk.service.server.product.nogplserver</id>
 	      <attachId>nogpl</attachId>
-	      <archiveFileName>hawk-server-nogpl_${maven.build.timestamp}</archiveFileName>
-	      <rootFolder>hawk-server-nogpl_${maven.build.timestamp}</rootFolder>
+	      <archiveFileName>hawk-server-nogpl_${qualifiedVersion}</archiveFileName>
+	      <rootFolder>hawk-server-nogpl_${qualifiedVersion}</rootFolder>
 	    </product>
 	  </products>
 	</configuration>