Merge into master from pull request #212:

Change methods in DeviceManagerImpl from private to protected. (https://github.com/floodlight/floodlight/pull/212)

src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImpl.java

@@ -791,7 +791,7 @@ IFlowReconcileListener, IInfoProvider, IHAListener {
      * @param pi the original packetin
      * @return the entity from the packet
      */
-    private Entity getSourceEntityFromPacket(Ethernet eth,
+    protected Entity getSourceEntityFromPacket(Ethernet eth,
                                              long swdpid,
                                              int port) {
         byte[] dlAddrArr = eth.getSourceMACAddress();
@@ -816,7 +816,7 @@ IFlowReconcileListener, IInfoProvider, IHAListener {
      * @param eth
      * @return
      */
-    private Entity getDestEntityFromPacket(Ethernet eth) {
+    protected Entity getDestEntityFromPacket(Ethernet eth) {
         byte[] dlAddrArr = eth.getDestinationMACAddress();
         long dlAddr = Ethernet.toLong(dlAddrArr);
         short vlan = eth.getVlanID();