VOL-595 - container image name consistency and general cleanup

Change-Id: Iccac1ccba61537cefa046118df139196e9e87713
diff --git a/unum/Dockerfile b/unum/Dockerfile
index a977bc7..bf11d29 100644
--- a/unum/Dockerfile
+++ b/unum/Dockerfile
@@ -11,7 +11,7 @@
 ## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 ## See the License for the specific language governing permissions and
 ## limitations under the License.
-FROM golang:1.8-alpine as builder
+FROM golang:1.9.2-alpine as builder
 MAINTAINER Open Networking Foundation <info@onlab.us>
 
 WORKDIR /go
diff --git a/unum/Makefile b/unum/Makefile
index ef82dfe..ce8c23c 100644
--- a/unum/Makefile
+++ b/unum/Makefile
@@ -20,7 +20,7 @@
 	@echo "  rm        - remove the sample 3 instance cluster"
 
 image:
-	docker build --rm --tag unum:latest .
+	docker build --rm --tag voltha/unum:latest .
 
 deploy:
 	docker stack deploy -c docker-compose.yml test