diff --git a/awsapi/pom.xml b/awsapi/pom.xml
index 88c53ceac4e..10b9c9be5b5 100644
--- a/awsapi/pom.xml
+++ b/awsapi/pom.xml
@@ -249,6 +249,9 @@
           <exclude>**/*.java</exclude>
         </excludes>
       </resource>
+      <resource>
+          <directory>../utils/conf/</directory>
+      </resource>      
     </resources>
     <plugins>
       <plugin>
diff --git a/console-proxy/certs/realhostip.csr b/console-proxy/certs/realhostip.csr
index 0684141d237..61395c9f8d9 100644
--- a/console-proxy/certs/realhostip.csr
+++ b/console-proxy/certs/realhostip.csr
@@ -1,15 +1,15 @@
------BEGIN NEW CERTIFICATE REQUEST-----
-MIICsDCCAZgCAQAwazELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRIwEAYDVQQHEwlDdXBlcnRp
-bm8xDjAMBgNVBAoTBVZNT3BzMRAwDgYDVQQLEwdVbmtub3duMRkwFwYDVQQDDBAqLnJlYWxob3N0
-aXAuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAg0/QLRH7PrPyPEF6eq6wsNIj
-SdPhoLMmzR4XlPiaS9/SzE2cpAq2YWZ8g78HcQqDnxN/Emt9m2hyjXbPstkh5zDbDpMPDnDbnBxA
-V9RSKTgRqYfQ+sQvrpsfaHesTFhE1L+4+odrvlgtzoQTPHxwgaiIgKJd9fyJHKg8cbB5UPEv6An0
-5VyVGOmJ+tvDgNV4oynUZ2nVdIWfNvXL/z2SpY48EFE8q3dCh0HpLAR/mAGEqNiVJfHpDS7DovP3
-D7X6I55bc0SNRl4tGTjbPFZw8ydGtoKmWPrsZc/ghmy5xp5TeI/XAaRPjH1BPt+Q6tdtbE6bEoBf
-OTM/qVYZ9kut9wIDAQABoAAwDQYJKoZIhvcNAQEFBQADggEBAF5lhhni9dW9MqSL2ixNbViPWpFS
-ecOggshYChJfZKrhsuZaDpumJ/+ebICS4zv/oxDwNLSmeAmydiaUQC9LFQEEwvPBYDTtTzwCrtwH
-yyFJQSm6pyeIBP/Bih/5hLW8JPm0bDbp5ldrHCDEgKQeeyQhyYOKFODkTuMLw+FLD+V86IVHxElL
-/urCRWyZEPwyMsgfsU6ywNX9XNShyk1uDHjFDE67sPhfw52ooxXrYQnBdTk+g0UXPbULzrCK/1kU
-fjRq347V9Fwi5NFyGADOaA+q6mtnlb1i3uH1n1YVUzevvpnIr3/RxPSYHB47Kj9iYKeDlYdTRHJy
-NpuvTfmQO2Y=
------END NEW CERTIFICATE REQUEST-----
+-----BEGIN NEW CERTIFICATE REQUEST-----
+MIICsDCCAZgCAQAwazELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRIwEAYDVQQHEwlDdXBlcnRp
+bm8xDjAMBgNVBAoTBVZNT3BzMRAwDgYDVQQLEwdVbmtub3duMRkwFwYDVQQDDBAqLnJlYWxob3N0
+aXAuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAg0/QLRH7PrPyPEF6eq6wsNIj
+SdPhoLMmzR4XlPiaS9/SzE2cpAq2YWZ8g78HcQqDnxN/Emt9m2hyjXbPstkh5zDbDpMPDnDbnBxA
+V9RSKTgRqYfQ+sQvrpsfaHesTFhE1L+4+odrvlgtzoQTPHxwgaiIgKJd9fyJHKg8cbB5UPEv6An0
+5VyVGOmJ+tvDgNV4oynUZ2nVdIWfNvXL/z2SpY48EFE8q3dCh0HpLAR/mAGEqNiVJfHpDS7DovP3
+D7X6I55bc0SNRl4tGTjbPFZw8ydGtoKmWPrsZc/ghmy5xp5TeI/XAaRPjH1BPt+Q6tdtbE6bEoBf
+OTM/qVYZ9kut9wIDAQABoAAwDQYJKoZIhvcNAQEFBQADggEBAF5lhhni9dW9MqSL2ixNbViPWpFS
+ecOggshYChJfZKrhsuZaDpumJ/+ebICS4zv/oxDwNLSmeAmydiaUQC9LFQEEwvPBYDTtTzwCrtwH
+yyFJQSm6pyeIBP/Bih/5hLW8JPm0bDbp5ldrHCDEgKQeeyQhyYOKFODkTuMLw+FLD+V86IVHxElL
+/urCRWyZEPwyMsgfsU6ywNX9XNShyk1uDHjFDE67sPhfw52ooxXrYQnBdTk+g0UXPbULzrCK/1kU
+fjRq347V9Fwi5NFyGADOaA+q6mtnlb1i3uH1n1YVUzevvpnIr3/RxPSYHB47Kj9iYKeDlYdTRHJy
+NpuvTfmQO2Y=
+-----END NEW CERTIFICATE REQUEST-----
diff --git a/console-proxy/ui/viewer-bad-sid.ftl b/console-proxy/ui/viewer-bad-sid.ftl
index 246cb7f38d5..2f30ec36015 100644
--- a/console-proxy/ui/viewer-bad-sid.ftl
+++ b/console-proxy/ui/viewer-bad-sid.ftl
@@ -1,29 +1,29 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
- 
-  http://www.apache.org/licenses/LICENSE-2.0
-    
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<html>
-<head>
-</head>
-<body>
-
-<div id="main_panel" tabindex="1">
-<p>Unable to start console session as access is denied because of bad sid</p>
-</div>
-
-</body>
-</html>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+ 
+  http://www.apache.org/licenses/LICENSE-2.0
+    
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<html>
+<head>
+</head>
+<body>
+
+<div id="main_panel" tabindex="1">
+<p>Unable to start console session as access is denied because of bad sid</p>
+</div>
+
+</body>
+</html>
diff --git a/console-proxy/ui/viewer-connect-failed.ftl b/console-proxy/ui/viewer-connect-failed.ftl
index 57af5bd7e7b..9d907cacb43 100644
--- a/console-proxy/ui/viewer-connect-failed.ftl
+++ b/console-proxy/ui/viewer-connect-failed.ftl
@@ -1,29 +1,29 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
- 
-  http://www.apache.org/licenses/LICENSE-2.0
-    
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<html>
-<head>
-</head>
-<body>
-
-<div id="main_panel" tabindex="1">
-<p>Unable to start console session as connection is refused by the machine you are accessing</p>
-</div>
-
-</body>
-</html>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+ 
+  http://www.apache.org/licenses/LICENSE-2.0
+    
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<html>
+<head>
+</head>
+<body>
+
+<div id="main_panel" tabindex="1">
+<p>Unable to start console session as connection is refused by the machine you are accessing</p>
+</div>
+
+</body>
+</html>
diff --git a/console-proxy/ui/viewer.ftl b/console-proxy/ui/viewer.ftl
index 0dd7b391b47..d1b2b56d02d 100644
--- a/console-proxy/ui/viewer.ftl
+++ b/console-proxy/ui/viewer.ftl
@@ -1,59 +1,59 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
- 
-  http://www.apache.org/licenses/LICENSE-2.0
-    
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<html>
-<head>
-<script type="text/javascript" language="javascript" src="/resource/js/jquery.js"></script>
-<script type="text/javascript" language="javascript" src="/resource/js/ajaxviewer.js"></script>
-<script type="text/javascript" language="javascript" src="/resource/js/handler.js"></script>
-<link rel="stylesheet" type="text/css" href="/resource/css/ajaxviewer.css"></link>
-<title>${title}</title>
-</head>
-<body>
-<div id="toolbar">
-<ul>
-	<li> 
-		<a href="#" onclick="javascript:sendCtrlAltDel();"> 
-			<span><img align="left" src="/resource/images/cad.gif" alt="Ctrl-Alt-Del" />Ctrl-Alt-Del</span> 
-		</a> 
-	</li>
-	<li> 
-		<a href="#" onclick="javascript:sendCtrlEsc();"> 
-			<span><img align="left" src="/resource/images/winlog.png" alt="Ctrl-Esc" style="width:16px;height:16px"/>Ctrl-Esc</span> 
-		</a> 
-	</li>
-</ul>
-<span id="light" class="dark"></span> 
-</div>
-
-<div id="main_panel" tabindex="1"></div>
-	
-<script language="javascript">
-
-var tileMap = [ ${tileSequence} ];
-var ajaxViewer = new AjaxViewer('main_panel', '${imgUrl}', '${updateUrl}', tileMap, 
-	${width}, ${height}, ${tileWidth}, ${tileHeight}, ${rawKeyboard});
-
-$(function() {
-	ajaxViewer.start();
-});
-
-</script>
-
-</body>
-</html>	
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+ 
+  http://www.apache.org/licenses/LICENSE-2.0
+    
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<html>
+<head>
+<script type="text/javascript" language="javascript" src="/resource/js/jquery.js"></script>
+<script type="text/javascript" language="javascript" src="/resource/js/ajaxviewer.js"></script>
+<script type="text/javascript" language="javascript" src="/resource/js/handler.js"></script>
+<link rel="stylesheet" type="text/css" href="/resource/css/ajaxviewer.css"></link>
+<title>${title}</title>
+</head>
+<body>
+<div id="toolbar">
+<ul>
+	<li> 
+		<a href="#" onclick="javascript:sendCtrlAltDel();"> 
+			<span><img align="left" src="/resource/images/cad.gif" alt="Ctrl-Alt-Del" />Ctrl-Alt-Del</span> 
+		</a> 
+	</li>
+	<li> 
+		<a href="#" onclick="javascript:sendCtrlEsc();"> 
+			<span><img align="left" src="/resource/images/winlog.png" alt="Ctrl-Esc" style="width:16px;height:16px"/>Ctrl-Esc</span> 
+		</a> 
+	</li>
+</ul>
+<span id="light" class="dark"></span> 
+</div>
+
+<div id="main_panel" tabindex="1"></div>
+	
+<script language="javascript">
+
+var tileMap = [ ${tileSequence} ];
+var ajaxViewer = new AjaxViewer('main_panel', '${imgUrl}', '${updateUrl}', tileMap, 
+	${width}, ${height}, ${tileWidth}, ${tileHeight}, ${rawKeyboard});
+
+$(function() {
+	ajaxViewer.start();
+});
+
+</script>
+
+</body>
+</html>	
