Merge remote-tracking branch 'origin/master' into upan-connect18

Change-Id: I668a901765f084cf07096e2390c59c846bd555f7
diff --git a/.gitreview b/.gitreview
index 328aec6..f3d79be 100644
--- a/.gitreview
+++ b/.gitreview
@@ -3,4 +3,4 @@
 port=29418
 project=onos.git
 defaultremote=origin
-defaultbranch=master
+defaultbranch=upan-connect18