Merge into master from pull request #2921:

Fix eclipse warnings and nits (https://github.com/bigswitch/bigswitchcontroller/pull/2921)

src/test/java/net/floodlightcontroller/core/internal/ControllerTest.java

@@ -18,8 +18,6 @@
 package net.floodlightcontroller.core.internal;
 
 import static org.easymock.EasyMock.*;
-import static org.junit.Assert.assertEquals;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;