Merge release branch 4.18 to 4.19

* 4.18:
  packaging: move contrail network plugin to noredist (#8932)

Author: DaanHoogland

client/pom.xml

@@ -28,10 +28,6 @@
         <version>4.19.1.0-SNAPSHOT</version>
     </parent>
     <repositories>
-        <repository>
-            <id>juniper-contrail</id>
-            <url>https://juniper.github.io/contrail-maven/snapshots</url>
-        </repository>
         <repository>
             <id>juniper-tungsten-api</id>
             <url>https://github.com/radu-todirica/tungsten-api/raw/master</url>
@@ -271,11 +267,6 @@
             <artifactId>cloud-plugin-network-nvp</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.cloudstack</groupId>
-            <artifactId>cloud-plugin-network-contrail</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.cloudstack</groupId>
             <artifactId>cloud-plugin-network-palo-alto</artifactId>
@@ -1102,6 +1093,11 @@
                     <artifactId>cloud-plugin-api-vmware-sioc</artifactId>
                     <version>${project.version}</version>
                 </dependency>
+                <dependency>
+                    <groupId>org.apache.cloudstack</groupId>
+                    <artifactId>cloud-plugin-network-contrail</artifactId>
+                    <version>${project.version}</version>
+                </dependency>
                 <dependency>
                     <groupId>org.apache.cloudstack</groupId>
                     <artifactId>cloud-plugin-backup-veeam</artifactId>

plugins/network-elements/juniper-contrail/pom.xml

@@ -27,12 +27,6 @@
         <version>4.19.1.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
-    <repositories>
-        <repository>
-            <id>juniper-contrail</id>
-            <url>https://juniper.github.io/contrail-maven/snapshots</url>
-        </repository>
-    </repositories>
     <dependencies>
         <dependency>
             <groupId>org.apache.cloudstack</groupId>

plugins/pom.xml

@@ -100,7 +100,6 @@
 
         <module>network-elements/bigswitch</module>
         <module>network-elements/dns-notifier</module>
-        <module>network-elements/juniper-contrail</module>
         <module>network-elements/elastic-loadbalancer</module>
         <module>network-elements/globodns</module>
         <module>network-elements/internal-loadbalancer</module>
@@ -230,6 +229,7 @@
                 <module>backup/veeam</module>
                 <module>hypervisors/vmware</module>
                 <module>network-elements/cisco-vnmc</module>
+                <module>network-elements/juniper-contrail</module>
             </modules>
         </profile>
         <profile>