Bumping version back to 1.7.0-SNAPSHOT

Change-Id: I1df9d0f12cd7ec7597499d41cacebdbe75899556
diff --git a/tools/build/envDefaults b/tools/build/envDefaults
index 5a5f3c6..b184030 100644
--- a/tools/build/envDefaults
+++ b/tools/build/envDefaults
@@ -19,7 +19,7 @@
 
 # ONOS Version and onos.tar.gz staging environment
 export ONOS_POM_VERSION="1.7.0-SNAPSHOT"
-export ONOS_VERSION=${ONOS_VERSION:-1.7.0-rc2.$BUILD_NUMBER}
+export ONOS_VERSION=${ONOS_VERSION:-1.7.0.$BUILD_NUMBER}
 
 # ONOS production bits (onos.tar.gz, onos.zip, onos.deb, onos.rpm) staging environment
 export ONOS_BITS=onos-${ONOS_VERSION%~*}
diff --git a/tools/package/branding/pom.xml b/tools/package/branding/pom.xml
index d35d611..6158d09 100644
--- a/tools/package/branding/pom.xml
+++ b/tools/package/branding/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos</artifactId>
-        <version>1.7.0-rc2</version>
+        <version>1.7.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>