External ip for byon - add ssh support

Author: ivanayov

core/src/main/java/org/apache/brooklyn/location/byon/ByonLocationResolver.java

@@ -152,10 +152,14 @@ protected LocationSpec<? extends MachineLocation> parseMachine(Map<String, ?> va
         Map<String, Object> machineConfig = MutableMap.copyOf(vals);
 
         String osFamily = (String) machineConfig.remove(OS_FAMILY.getName());
-        String ssh = (String) machineConfig.remove("ssh");
-        if (machineConfig.containsKey("winrm") && !(machineConfig.get("winrm") instanceof String)) {
+        if (machineConfig.containsKey("ssh") && !(machineConfig.get("ssh") instanceof String)) {
+            machineConfig.put("address", machineConfig.get("ssh"));
+            machineConfig.remove("ssh");
+        } else if (machineConfig.containsKey("winrm") && !(machineConfig.get("winrm") instanceof String)) {
             machineConfig.put("address", machineConfig.get("winrm"));
+            machineConfig.remove("winrm");
         } else {
+            String ssh = (String) machineConfig.remove("ssh");
             String winrm = (String) machineConfig.remove("winrm");
 
             Map<Integer, String> tcpPortMappings = (Map<Integer, String>) machineConfig.get("tcpPortMappings");