Merge pull request #1430 from myENA/4.7_cloudstack-9285

CLOUDSTACK-9285 for 4.7.xPer Daan's request, here is a pull request for the 4.7.x release.

* pr/1430:
  Cloudstack 9285 for 4.7.x
  CLOUDSTACK-9285 - Address original on start exception(s) and newline cleanup
  Cloudstack 9285 for 4.7.x

Signed-off-by: Will Stevens <williamstevens@gmail.com>

Author: swill

agent/src/com/cloud/agent/Agent.java

@@ -227,15 +227,15 @@ public void start() {
         try {
             _connection.start();
         } catch (final NioConnectionException e) {
-            throw new CloudRuntimeException("Unable to start the connection!", e);
+            s_logger.info("Attempted to connect to the server, but received an unexpected exception, trying again...");
         }
         while (!_connection.isStartup()) {
             _shell.getBackoffAlgorithm().waitBeforeRetry();
             _connection = new NioClient("Agent", _shell.getHost(), _shell.getPort(), _shell.getWorkers(), this);
             try {
                 _connection.start();
             } catch (final NioConnectionException e) {
-                throw new CloudRuntimeException("Unable to start the connection!", e);
+                s_logger.info("Attempted to connect to the server, but received an unexpected exception, trying again...");
             }
         }
     }
@@ -412,7 +412,7 @@ protected void reconnect(final Link link) {
             try {
                 _connection.start();
             } catch (final NioConnectionException e) {
-                throw new CloudRuntimeException("Unable to start the connection!", e);
+                s_logger.info("Attempted to connect to the server, but received an unexpected exception, trying again...");
             }
             _shell.getBackoffAlgorithm().waitBeforeRetry();
         } while (!_connection.isStartup());