Use better err templates in restore bubble call

bubble-server/src/main/java/bubble/service/cloud/StandardNetworkService.java

@@ -627,10 +627,10 @@ public class StandardNetworkService implements NetworkService {
             // sanity checks
             final List<BubbleNode> nodes = nodeDAO.findByNetwork(network.getUuid());
             if (!nodes.isEmpty()) {
-                throw invalidEx("err.network.restore.nodesExist");
+                throw invalidEx("err.networkRestore.nodesExist");
             }
             if (network.getState() != BubbleNetworkState.stopped) {
-                throw invalidEx("err.network.restore.notStopped");
+                throw invalidEx("err.networkRestore.notStopped");
             }
             network.setState(BubbleNetworkState.starting);
             networkDAO.update(network);
@@ -661,8 +661,14 @@ public class StandardNetworkService implements NetworkService {
 
             return newNodeRequest;
 
+        } catch (SimpleViolationException e) {
+            // TODO: should this go here, or just in some specific cases within above try block?
+            //       also, should this go into other method here that are locking network?
+            try { unlockNetwork(network.getUuid(), lock); } catch (Exception e1) { }
+            log.error("startNetwork: original SimpleViolationException: ", e);
+            throw e;
         } catch (Exception e) {
-            return die("startNetwork: "+e, e);
+            return die("startNetwork: " + e, e);
         }
     }
 

bubble-server/src/main/resources/message_templates/en_US/server/post_auth/ResourceMessages.properties

@@ -634,8 +634,8 @@ err.networkKeys.invalid=Bubble Restore Key was not valid
 err.networkName.required=Network name is required
 err.network.cannotStartInCurrentState=Cannot proceed: network cannot be started in its current state
 err.network.required=Network is required
-err.network.restore.nodesExist=Cannot restore when active nodes exist
-err.network.restore.notStopped=Cannot restore when network is running
+err.networkRestore.nodesExist=Cannot restore when active nodes exist
+err.networkRestore.notStopped=Cannot restore when network is running
 err.nick.alreadyInUse=Nickname is already in use by another contact
 err.nick.tooLong=Nickname cannot be longer than 100 characters
 err.node.notInitialized=Node is not initialized