Merge remote branch 'bigswitch/master'

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

@@ -21,7 +21,6 @@ import static org.easymock.EasyMock.*;
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;