Merge "Fix checkstyle errors in sal-compatibility"

diff --combined opendaylight/commons/opendaylight/pom.xml
index 61febcfdc527c4d6b16aa242a8619ba0fb3e03b2,1c21351d57205288197e16c3bcb4d5ff62843e87..990276468b7dd3c47098d749ed5ed270e6bcec15
--- 1/opendaylight/commons/opendaylight/pom.xml
--- 2/opendaylight/commons/opendaylight/pom.xml
+++ b/opendaylight/commons/opendaylight/pom.xml
@@@ -20,9 -20,9 +20,9 @@@
      <appauth.version>0.4.2-SNAPSHOT</appauth.version>
      <archetype-app-northbound>0.0.1-SNAPSHOT</archetype-app-northbound>
      <aries.util.version>1.1.0</aries.util.version>
-     <arphandler.version>0.5.2-SNAPSHOT</arphandler.version>
      <!-- Controller Modules Versions -->
      <arphandler.version>0.5.2-SNAPSHOT</arphandler.version>
+     <arphandler.version>0.5.2-SNAPSHOT</arphandler.version>
      <asm.version>4.1</asm.version>
      <!-- Plugin Versions -->
      <bouncycastle.version>1.50</bouncycastle.version>
@@@ -340,11 -340,6 +340,11 @@@
          <artifactId>akka-remote_${scala.version}</artifactId>
          <version>${akka.version}</version>
        </dependency>
 +      <dependency>
 +        <groupId>com.typesafe.akka</groupId>
 +        <artifactId>akka-testkit_${scala.version}</artifactId>
 +        <version>${akka.version}</version>
 +      </dependency>
        <dependency>
          <groupId>commons-codec</groupId>
          <artifactId>commons-codec</artifactId>