diff --git a/src/main/resources/dcs-webapps/master/aggr_querystats.jsp b/src/main/resources/dcs-webapps/master/aggr_querystats.jsp
index 90df358..23a3049 100644
--- a/src/main/resources/dcs-webapps/master/aggr_querystats.jsp
+++ b/src/main/resources/dcs-webapps/master/aggr_querystats.jsp
@@ -1,20 +1,24 @@
-<!-- @@@ START COPYRIGHT @@@                                                         -->
-<!--                                                                                 -->
-<!-- (C) Copyright 2015 Hewlett-Packard Development Company, L.P.                    -->
-<!--                                                                                 -->
-<!-- Licensed 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.                                                  -->
-<!--                                                                                 -->
-<!-- @@@ END COPYRIGHT @@@                                                           -->
+<%--
+/**
+ * @@@ START COPYRIGHT @@@  
+ *
+ * (C) Copyright 2015 Hewlett-Packard Development Company, L.P.                 
+ *                                                                             
+ * Licensed 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.                                                
+ *                                                                                 
+ * @@@ END COPYRIGHT @@@     
+ */
+--%>
 <%@ taglib uri="http://displaytag.sf.net" prefix="display" %>
 <%@ page contentType="text/html;charset=UTF-8"
   import="java.io.*"
diff --git a/src/main/resources/dcs-webapps/master/css/Spacetree.css b/src/main/resources/dcs-webapps/master/css/Spacetree.css
index 6c6b2b8..e11013e 100644
--- a/src/main/resources/dcs-webapps/master/css/Spacetree.css
+++ b/src/main/resources/dcs-webapps/master/css/Spacetree.css
@@ -1,3 +1,20 @@
+/* @@@ START COPYRIGHT @@@
+**
+** (C) Copyright 2013-2015 Hewlett-Packard Development Company, L.P.
+**
+**  Licensed 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.
+**
+** @@@ END COPYRIGHT @@@ */
 .jit-autoadjust-label {
   padding: 15px;
 }
diff --git a/src/main/resources/dcs-webapps/master/executeQuery.jsp b/src/main/resources/dcs-webapps/master/executeQuery.jsp
index e99ad62..ddae091 100644
--- a/src/main/resources/dcs-webapps/master/executeQuery.jsp
+++ b/src/main/resources/dcs-webapps/master/executeQuery.jsp
@@ -1,20 +1,24 @@
-<!-- @@@ START COPYRIGHT @@@                                                         -->
-<!--                                                                                 -->
-<!-- (C) Copyright 2015 Hewlett-Packard Development Company, L.P.                    -->
-<!--                                                                                 -->
-<!-- Licensed 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.                                                  -->
-<!--                                                                                 -->
-<!-- @@@ END COPYRIGHT @@@                                                           -->
+<%--
+/**
+ * @@@ START COPYRIGHT @@@  
+ *
+ * (C) Copyright 2015 Hewlett-Packard Development Company, L.P.                 
+ *                                                                             
+ * Licensed 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.                                                
+ *                                                                                 
+ * @@@ END COPYRIGHT @@@     
+ */
+--%>
 <%@ taglib uri="http://displaytag.sf.net" prefix="display" %>
 <%@ page contentType="text/html;charset=UTF-8"
   import="java.io.*"
diff --git a/src/main/resources/dcs-webapps/master/js/ExplainPlanView.js b/src/main/resources/dcs-webapps/master/js/ExplainPlanView.js
index b5b4918..efb1c15 100644
--- a/src/main/resources/dcs-webapps/master/js/ExplainPlanView.js
+++ b/src/main/resources/dcs-webapps/master/js/ExplainPlanView.js
@@ -1,3 +1,22 @@
+/**
+ * @@@ START COPYRIGHT @@@  
+ *
+ * (C) Copyright 2015 Hewlett-Packard Development Company, L.P.                 
+ *                                                                             
+ * Licensed 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.                                                
+ *                                                                                 
+ * @@@ END COPYRIGHT @@@     
+ */
 var setRootNode = false;
 var LOADING_SELECTOR = ".hpdsm-spinner";			
 var st = null;
diff --git a/src/main/resources/dcs-webapps/master/queryPlan.jsp b/src/main/resources/dcs-webapps/master/queryPlan.jsp
index 10c0577..d30c86b 100644
--- a/src/main/resources/dcs-webapps/master/queryPlan.jsp
+++ b/src/main/resources/dcs-webapps/master/queryPlan.jsp
@@ -1,20 +1,24 @@
-<!-- @@@ START COPYRIGHT @@@                                                         -->
-<!--                                                                                 -->
-<!-- (C) Copyright 2015 Hewlett-Packard Development Company, L.P.                    -->
-<!--                                                                                 -->
-<!-- Licensed 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.                                                  -->
-<!--                                                                                 -->
-<!-- @@@ END COPYRIGHT @@@                                                           -->
+<%--
+/**
+ * @@@ START COPYRIGHT @@@  
+ *
+ * (C) Copyright 2015 Hewlett-Packard Development Company, L.P.                 
+ *                                                                             
+ * Licensed 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.                                                
+ *                                                                                 
+ * @@@ END COPYRIGHT @@@     
+ */
+--%>
 <%@ page contentType="text/html;charset=UTF-8"
   import="java.io.*"
   import="java.util.*"
diff --git a/src/main/resources/dcs-webapps/master/querystats.jsp b/src/main/resources/dcs-webapps/master/querystats.jsp
index 3eb903d..da83d53 100644
--- a/src/main/resources/dcs-webapps/master/querystats.jsp
+++ b/src/main/resources/dcs-webapps/master/querystats.jsp
@@ -1,20 +1,24 @@
-<!-- @@@ START COPYRIGHT @@@                                                         -->
-<!--                                                                                 -->
-<!-- (C) Copyright 2015 Hewlett-Packard Development Company, L.P.                    -->
-<!--                                                                                 -->
-<!-- Licensed 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.                                                  -->
-<!--                                                                                 -->
-<!-- @@@ END COPYRIGHT @@@                                                           -->
+<%--
+/**
+ * @@@ START COPYRIGHT @@@  
+ *
+ * (C) Copyright 2015 Hewlett-Packard Development Company, L.P.                 
+ *                                                                             
+ * Licensed 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.                                                
+ *                                                                                 
+ * @@@ END COPYRIGHT @@@     
+ */
+--%>
 <%@ taglib uri="http://displaytag.sf.net" prefix="display" %>
 <%@ page contentType="text/html;charset=UTF-8"
   import="java.io.*"
diff --git a/src/main/resources/dcs-webapps/master/repository.jsp b/src/main/resources/dcs-webapps/master/repository.jsp
index 6d114a4..d94b954 100644
--- a/src/main/resources/dcs-webapps/master/repository.jsp
+++ b/src/main/resources/dcs-webapps/master/repository.jsp
@@ -1,20 +1,24 @@
-<!-- @@@ START COPYRIGHT @@@                                                         -->
-<!--                                                                                 -->
-<!-- (C) Copyright 2015 Hewlett-Packard Development Company, L.P.                    -->
-<!--                                                                                 -->
-<!-- Licensed 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.                                                  -->
-<!--                                                                                 -->
-<!-- @@@ END COPYRIGHT @@@                                                           -->
+<%--
+/**
+ * @@@ START COPYRIGHT @@@  
+ *
+ * (C) Copyright 2015 Hewlett-Packard Development Company, L.P.                 
+ *                                                                             
+ * Licensed 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.                                                
+ *                                                                                 
+ * @@@ END COPYRIGHT @@@     
+ */
+--%>
 <%@ page contentType="text/html;charset=UTF-8"
   import="java.io.*"
   import="java.util.*"
diff --git a/src/main/resources/dcs-webapps/master/servers.jsp b/src/main/resources/dcs-webapps/master/servers.jsp
index 370a089..472449b 100644
--- a/src/main/resources/dcs-webapps/master/servers.jsp
+++ b/src/main/resources/dcs-webapps/master/servers.jsp
@@ -1,20 +1,37 @@
-<!-- @@@ START COPYRIGHT @@@                                                         -->
-<!--                                                                                 -->
-<!-- (C) Copyright 2013-2015 Hewlett-Packard Development Company, L.P.               -->
-<!--                                                                                 -->
-<!-- Licensed 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.                                                  -->
-<!--                                                                                 -->
-<!-- @@@ END COPYRIGHT @@@                                                           -->
+<%--
+/**
+ *(C) Copyright 2015 Hewlett-Packard Development Company, L.P.
+ *
+ * Licensed 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.
+ */
+/**
+ * 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.
+ */
+--%>
 <%@ taglib uri="http://displaytag.sf.net" prefix="display" %>
 <%@ page contentType="text/html;charset=UTF-8"
   import="java.io.*"
diff --git a/src/main/resources/dcs-webapps/master/sessions.jsp b/src/main/resources/dcs-webapps/master/sessions.jsp
index 9e52397..dcd9b8f 100644
--- a/src/main/resources/dcs-webapps/master/sessions.jsp
+++ b/src/main/resources/dcs-webapps/master/sessions.jsp
@@ -1,20 +1,24 @@
-<!-- @@@ START COPYRIGHT @@@                                                         -->
-<!--                                                                                 -->
-<!-- (C) Copyright 2015 Hewlett-Packard Development Company, L.P.                    -->
-<!--                                                                                 -->
-<!-- Licensed 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.                                                  -->
-<!--                                                                                 -->
-<!-- @@@ END COPYRIGHT @@@                                                           -->
+<%--
+/**
+ * @@@ START COPYRIGHT @@@  
+ *
+ * (C) Copyright 2015 Hewlett-Packard Development Company, L.P.                 
+ *                                                                             
+ * Licensed 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.                                                
+ *                                                                                 
+ * @@@ END COPYRIGHT @@@     
+ */
+--%>
 <%@ page contentType="text/html;charset=UTF-8"
   import="java.io.*"
   import="java.util.*"