Merge branch 'develop' into fixing-rest-keystore-types

Author: sfiorani

kura/distrib/src/main/resources/unfiltered/pkg/user/security/cacerts.ks

@@ -146,25 +146,6 @@
             </esf:property>
         </esf:properties>
     </esf:configuration>
-    <esf:configuration pid="DMKeystore">
-        <esf:properties>
-            <esf:property array="false" encrypted="false" name="keystore.path" type="String">
-                <esf:value>/tmp/kura/user/security/dmkeystore.ks</esf:value>
-            </esf:property>
-            <esf:property array="false" encrypted="true" name="keystore.password" type="Password">
-                <esf:value>Y2hhbmdlaXQ=</esf:value>
-            </esf:property>
-            <esf:property array="false" encrypted="false" name="randomize.password" type="Boolean">
-                <esf:value>false</esf:value>
-            </esf:property>
-            <esf:property array="false" encrypted="false" name="service.factoryPid" type="String">
-                <esf:value>org.eclipse.kura.core.keystore.FilesystemKeystoreServiceImpl</esf:value>
-            </esf:property>
-            <esf:property array="false" encrypted="false" name="kura.service.pid" type="String">
-                <esf:value>DMKeystore</esf:value>
-            </esf:property>
-        </esf:properties>
-    </esf:configuration>
     <esf:configuration pid="org.eclipse.kura.http.server.manager.HttpService">
         <esf:properties>
             <esf:property array="true" encrypted="false" name="http.ports" type="Integer">