Merge remote-tracking branch 'bigswitch/master' into misc

...va/net/floodlightcontroller/core/internal/Controller.java

...odlightcontroller/core/module/FloodlightModuleLoader.java

...ntroller/linkdiscovery/internal/LinkDiscoveryManager.java

src/main/java/net/floodlightcontroller/packet/LLDP.java

src/main/java/net/floodlightcontroller/packet/LLDPTLV.java

...main/java/net/floodlightcontroller/util/EventHistory.java

src/main/java/org/openflow/protocol/OFPacketOut.java

src/test/java/org/openflow/protocol/OFPacketOutTest.java