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

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

...et/floodlightcontroller/core/internal/OFChannelState.java

...a/net/floodlightcontroller/core/internal/RoleChanger.java

...n/java/org/openflow/protocol/OFStatisticsMessageBase.java

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

...main/java/org/openflow/protocol/factory/BasicFactory.java

...et/floodlightcontroller/core/internal/ControllerTest.java

...t/floodlightcontroller/core/internal/RoleChangerTest.java

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