minor role relinquishment fix

Change-Id: I8fb2d65795b6bba6c0838c5efcf17d6f6528ea65

@@ -99,8 +99,8 @@ implements MastershipService, MastershipAdminService {
     @Override
     public void relinquishMastership(DeviceId deviceId) {
         MastershipEvent event = null;
-            event = store.relinquishRole(
-                    clusterService.getLocalNode().id(), deviceId);
+        event = store.relinquishRole(
+                clusterService.getLocalNode().id(), deviceId);
 
         if (event != null) {
             post(event);

@@ -257,6 +257,8 @@ public class DeviceManager
             // temporarily request for Master Role and mark offline.
             if (!mastershipService.getLocalRole(deviceId).equals(MastershipRole.MASTER)) {
                 log.debug("Device {} disconnected, but I am not the master", deviceId);
+                //let go of any role anyways
+                mastershipService.relinquishMastership(deviceId);
                 return;
             }
             DeviceEvent event = store.markOffline(deviceId);