Starting 1.6.1 VERSION, also fixing issues with master image

Change-Id: Id8f094f3f616630dd0e5191d21eefe27b6274978
diff --git a/VERSION b/VERSION
index dc1e644..06bb452 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.6.0
+1.6.1-dev