Merge branch 'master' into topic/ietf_yang

Change-Id: I489ceff034e498cff459393c7284370710dc12c6
Signed-off-by: Lorand Jakab <lojakab@cisco.com>

diff --cc features/pom.xml
Simple merge

diff --cc features/src/main/features/features.xml
Simple merge

diff --cc mappingservice/lisp-proto/pom.xml
index 081ee5f47fd5668c7ecb4e84bc2f96b55ddba701,38c79568d8dfed5aaab19f5f679543971e175559..bc3d208afaa582b9da6ab2146257ac33962bf019
--- 1/mappingservice/lisp-proto/pom.xml
--- 2/mappingservice/lisp-proto/pom.xml
+++ b/mappingservice/lisp-proto/pom.xml
@@@ -48,36 -48,37 +48,68 @@@ and is available at http://www.eclipse.
      </dependency>
    </dependencies>
  
 +  <!-- Temporarily disable compiling non-generated code, like serializers, which won't build for now -->
    <build>
+     <pluginManagement>
+       <plugins>
+         <plugin>
+           <!-- Temporarily override the odlparent checkstyle configuration.
+                We want to enforce some simple rules and add more as we clean up code -->
+           <artifactId>maven-checkstyle-plugin</artifactId>
+           <configuration>
+             <configLocation>checkstyle/java_rules.xml</configLocation>
+             <includeTestSourceDirectory>true</includeTestSourceDirectory>
+             <excludes>org/opendaylight/yang/gen/**,**/config/yang/**</excludes>
+             <failsOnError>true</failsOnError>
+             <consoleOutput>true</consoleOutput>
+           </configuration>
+           <dependencies>
+             <dependency>
+               <groupId>org.opendaylight.lispflowmapping</groupId>
+               <artifactId>common.build.tools</artifactId>
+               <version>${project.version}</version>
+             </dependency>
+           </dependencies>
+           <executions>
+             <execution>
+               <goals>
+                 <goal>check</goal>
+               </goals>
+               <phase>process-sources</phase>
+             </execution>
+           </executions>
+         </plugin>
+       </plugins>
+     </pluginManagement>
++
 +    <plugins>
 +      <plugin>
 +        <artifactId>maven-compiler-plugin</artifactId>
 +        <executions>
 +          <execution>
 +            <id>default-compile</id>
 +            <phase>compile</phase>
 +            <goals>
 +              <goal>compile</goal>
 +            </goals>
 +            <configuration>
 +              <excludes>
 +                <exclude>org/opendaylight/lispflowmapping/**</exclude>
 +              </excludes>
 +            </configuration>
 +          </execution>
 +          <execution>
 +            <id>default-testCompile</id>
 +            <phase>test-compile</phase>
 +            <goals>
 +              <goal>testCompile</goal>
 +            </goals>
 +            <configuration>
 +              <skip>true</skip>
 +            </configuration>
 +          </execution>
 +        </executions>
 +      </plugin>
 +    </plugins>
    </build>
  </project>

diff --cc mappingservice/pom.xml
Simple merge