Changed intermediate version numbers to be git-style, eg 7.0.0-39 instead of 7.1.0-PRE

* Changed datastore modstate to be last in file, as prior to 7.0

test/config.sh.in

@@ -64,9 +64,6 @@ CC=@CC@
 # Top src dir
 TOP_SRCDIR=@top_srcdir@
 
-# Clixon version
-CLIXON_VERSION=@CLIXON_VERSION@
-
 CLICON_USER=@CLICON_USER@
 CLICON_GROUP=@CLICON_GROUP@
 

test/lib.sh

@@ -41,6 +41,9 @@ if [ -f ./config.sh ]; then
     fi
 fi
 
+# Note that this relies on git being present in shell
+CLIXON_VERSION="$(git log --pretty="format:%(describe) %ci" -n1)"
+
 # Test number from start
 : ${testnr:=0}