Merge pull request #536 from rizard/master

.../java/net/floodlightcontroller/accesscontrollist/ACL.java

.../java/net/floodlightcontroller/core/IOFSwitchBackend.java

src/main/java/net/floodlightcontroller/core/OFSwitch.java

...ghtcontroller/core/internal/OFSwitchHandshakeHandler.java

...t/floodlightcontroller/core/internal/OFSwitchManager.java

src/main/resources/floodlightdefault.properties

...ightcontroller/core/internal/OFSwitchHandlerTestBase.java

...oodlightcontroller/core/internal/OFSwitchManagerTest.java