Fixes related to single-point-to-multi-point intents:
 * At the CLI level, the Ingress point argument should be specified
   before the Egress points arguments.
   This follows the natural Ingress/Egress argument ordering for
   other intents.
 * Added missing optional CLI complementer to shell-config.xml

Change-Id: I49f1ec9706a2f47bbb513d388a26fa5d40cba1bd
NOTE: Those changes are carried from Gerrit 1586.
diff --git a/cli/src/main/resources/OSGI-INF/blueprint/shell-config.xml b/cli/src/main/resources/OSGI-INF/blueprint/shell-config.xml
index 799e732..265dcd0 100644
--- a/cli/src/main/resources/OSGI-INF/blueprint/shell-config.xml
+++ b/cli/src/main/resources/OSGI-INF/blueprint/shell-config.xml
@@ -180,6 +180,7 @@
             </completers>
             <optional-completers>
                 <entry key="-t" value-ref="ethTypeCompleter"/>
+                <entry key="--ipProto" value-ref="ipProtocolCompleter"/>
             </optional-completers>
         </command>
         <command>