Merge "Working md-sal features, including restconf, toaster, flow-services"

diff --combined opendaylight/md-sal/sal-rest-connector-config/src/main/resources/initial/10-rest-connector.xml
index c1c57617082b0f79e6a3b9435eea2fd455ebad04,438906bd9addda3d55a99db120c703cb986dfbf1..3be423c35628d06378ead78b344059a15dcc3ed6
--- 1/opendaylight/md-sal/sal-rest-connector-config/src/main/resources/initial/10-rest-connector.xml
--- 2/opendaylight/md-sal/sal-rest-connector-config/src/main/resources/initial/10-rest-connector.xml
+++ b/opendaylight/md-sal/sal-rest-connector-config/src/main/resources/initial/10-rest-connector.xml
@@@ -14,7 -14,7 +14,7 @@@ and is available at http://www.eclipse.
          <module>
            <type xmlns:rest="urn:opendaylight:params:xml:ns:yang:controller:md:sal:rest:connector">rest:rest-connector-impl</type>
            <name>rest-connector-default-impl</name>
-           <websocket-port>8181</websocket-port>
+           <websocket-port>8185</websocket-port>
            <dom-broker>
              <type xmlns:dom="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">dom:dom-broker-osgi-registry</type>
              <name>dom-broker</name>
@@@ -35,7 -35,4 +35,7 @@@
        </services>
      </data>
    </configuration>
 +  <required-capabilities>
 +      <capability>urn:opendaylight:params:xml:ns:yang:controller:md:sal:rest:connector?module=opendaylight-rest-connector&amp;revision=2014-07-24</capability>
 +  </required-capabilities>
  </snapshot>