Moving to 6653; flow decomp to handle failed flows

Change-Id: Ic5f6f0a549d6f2e5bdef13b4e9e182b1aa5bd652
diff --git a/compose/docker-compose-auth-test.yml b/compose/docker-compose-auth-test.yml
index bffff03..4b12ef5 100644
--- a/compose/docker-compose-auth-test.yml
+++ b/compose/docker-compose-auth-test.yml
@@ -21,6 +21,8 @@
    - "8101:8101" # ssh
    - "6653:6653" # OF
    - "8181:8181" # UI
+  #environment:
+  #  ONOS_APPS: openflow,drivers,org.opencord.aaa,org.opencord.cord-config,org.onosproject.olt
   networks:
     authnet:
      ipv4_address: 172.25.0.200
diff --git a/compose/docker-compose-system-test.yml b/compose/docker-compose-system-test.yml
index 3689dc9..028cbcb 100644
--- a/compose/docker-compose-system-test.yml
+++ b/compose/docker-compose-system-test.yml
@@ -195,7 +195,7 @@
       "-v",
       "--consul=${DOCKER_HOST_IP}:8500",
       "--fluentd=fluentd:24224",
-      "--controller=${DOCKER_HOST_IP}:6633",
+      "--controller=${DOCKER_HOST_IP}:6653",
       "--grpc-endpoint=@voltha-grpc",
       "--instance-id-is-container-name",
       "-v"