Merge pull request #598 from rizard/master

...t/floodlightcontroller/devicemanager/internal/Device.java

...tcontroller/devicemanager/internal/DeviceManagerImpl.java

...a/net/floodlightcontroller/loadbalancer/LoadBalancer.java

...java/net/floodlightcontroller/routing/ForwardingBase.java

...a/net/floodlightcontroller/topology/ITopologyService.java

...a/net/floodlightcontroller/topology/TopologyInstance.java

...va/net/floodlightcontroller/topology/TopologyManager.java

...dlightcontroller/topology/web/SwitchClustersResource.java

...a/net/floodlightcontroller/accesscontrollist/ACLTest.java

...troller/devicemanager/internal/DeviceManagerImplTest.java

...a/net/floodlightcontroller/forwarding/ForwardingTest.java

...t/floodlightcontroller/loadbalancer/LoadBalancerTest.java