Merge branch 'master' of github.com:bigswitch/bigswitchcontroller

...floodlightcontroller/core/IFloodlightProviderService.java

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

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

...floodlightcontroller/core/web/ControllerRoleResource.java

...net/floodlightcontroller/core/web/SwitchRoleResource.java

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

...loodlightcontroller/core/test/MockFloodlightProvider.java