You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by mi...@apache.org on 2016/11/07 22:23:25 UTC

[04/26] incubator-trafficcontrol git commit: merge master

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/private/deliveryService/view/charts/index.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/private/deliveryService/view/charts/index.js b/traffic_portal/app/src/modules/private/deliveryService/view/charts/index.js
index 7e27fe7..f0856ea 100644
--- a/traffic_portal/app/src/modules/private/deliveryService/view/charts/index.js
+++ b/traffic_portal/app/src/modules/private/deliveryService/view/charts/index.js
@@ -1,6 +1,5 @@
 /*
 
- Copyright 2015 Comcast Cable Communications Management, LLC
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/private/deliveryService/view/charts/transactionsPerSecond/index.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/private/deliveryService/view/charts/transactionsPerSecond/index.js b/traffic_portal/app/src/modules/private/deliveryService/view/charts/transactionsPerSecond/index.js
index 60406e6..36be5f9 100644
--- a/traffic_portal/app/src/modules/private/deliveryService/view/charts/transactionsPerSecond/index.js
+++ b/traffic_portal/app/src/modules/private/deliveryService/view/charts/transactionsPerSecond/index.js
@@ -1,6 +1,5 @@
 /*
 
- Copyright 2015 Comcast Cable Communications Management, LLC
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/private/deliveryService/view/deliveryService.view.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/private/deliveryService/view/deliveryService.view.tpl.html b/traffic_portal/app/src/modules/private/deliveryService/view/deliveryService.view.tpl.html
index 1d92baa..9a51f63 100644
--- a/traffic_portal/app/src/modules/private/deliveryService/view/deliveryService.view.tpl.html
+++ b/traffic_portal/app/src/modules/private/deliveryService/view/deliveryService.view.tpl.html
@@ -1,6 +1,5 @@
 <!--
 
-Copyright 2015 Comcast Cable Communications Management, LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/private/deliveryService/view/index.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/private/deliveryService/view/index.js b/traffic_portal/app/src/modules/private/deliveryService/view/index.js
index 6813967..bb71dd4 100644
--- a/traffic_portal/app/src/modules/private/deliveryService/view/index.js
+++ b/traffic_portal/app/src/modules/private/deliveryService/view/index.js
@@ -1,6 +1,5 @@
 /*
 
- Copyright 2015 Comcast Cable Communications Management, LLC
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/private/deliveryService/view/overview/DeliveryServiceViewOverviewController.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/private/deliveryService/view/overview/DeliveryServiceViewOverviewController.js b/traffic_portal/app/src/modules/private/deliveryService/view/overview/DeliveryServiceViewOverviewController.js
index a69bf5e..e359557 100644
--- a/traffic_portal/app/src/modules/private/deliveryService/view/overview/DeliveryServiceViewOverviewController.js
+++ b/traffic_portal/app/src/modules/private/deliveryService/view/overview/DeliveryServiceViewOverviewController.js
@@ -1,6 +1,5 @@
 /*
 
- Copyright 2015 Comcast Cable Communications Management, LLC
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/private/deliveryService/view/overview/_deliveryService.view.overview.scss
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/private/deliveryService/view/overview/_deliveryService.view.overview.scss b/traffic_portal/app/src/modules/private/deliveryService/view/overview/_deliveryService.view.overview.scss
index 0c9af4c..cef58e6 100644
--- a/traffic_portal/app/src/modules/private/deliveryService/view/overview/_deliveryService.view.overview.scss
+++ b/traffic_portal/app/src/modules/private/deliveryService/view/overview/_deliveryService.view.overview.scss
@@ -1,6 +1,5 @@
 /*
 
- Copyright 2015 Comcast Cable Communications Management, LLC
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/private/deliveryService/view/overview/deliveryService.view.overview.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/private/deliveryService/view/overview/deliveryService.view.overview.tpl.html b/traffic_portal/app/src/modules/private/deliveryService/view/overview/deliveryService.view.overview.tpl.html
index 2c4d148..fbc3ea3 100644
--- a/traffic_portal/app/src/modules/private/deliveryService/view/overview/deliveryService.view.overview.tpl.html
+++ b/traffic_portal/app/src/modules/private/deliveryService/view/overview/deliveryService.view.overview.tpl.html
@@ -1,6 +1,5 @@
 <!--
 
-Copyright 2015 Comcast Cable Communications Management, LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/private/deliveryService/view/overview/detail/index.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/private/deliveryService/view/overview/detail/index.js b/traffic_portal/app/src/modules/private/deliveryService/view/overview/detail/index.js
index 8d8cc86..508dd00 100644
--- a/traffic_portal/app/src/modules/private/deliveryService/view/overview/detail/index.js
+++ b/traffic_portal/app/src/modules/private/deliveryService/view/overview/detail/index.js
@@ -1,6 +1,5 @@
 /*
 
- Copyright 2015 Comcast Cable Communications Management, LLC
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/private/deliveryService/view/overview/index.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/private/deliveryService/view/overview/index.js b/traffic_portal/app/src/modules/private/deliveryService/view/overview/index.js
index 3d7d6d6..452f37b 100644
--- a/traffic_portal/app/src/modules/private/deliveryService/view/overview/index.js
+++ b/traffic_portal/app/src/modules/private/deliveryService/view/overview/index.js
@@ -1,6 +1,5 @@
 /*
 
- Copyright 2015 Comcast Cable Communications Management, LLC
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/private/index.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/private/index.js b/traffic_portal/app/src/modules/private/index.js
index 44d8a98..9a71075 100644
--- a/traffic_portal/app/src/modules/private/index.js
+++ b/traffic_portal/app/src/modules/private/index.js
@@ -1,6 +1,5 @@
 /*
 
- Copyright 2015 Comcast Cable Communications Management, LLC
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/private/private.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/private/private.tpl.html b/traffic_portal/app/src/modules/private/private.tpl.html
index 9543121..95afc8f 100644
--- a/traffic_portal/app/src/modules/private/private.tpl.html
+++ b/traffic_portal/app/src/modules/private/private.tpl.html
@@ -1,6 +1,5 @@
 <!--
 
-Copyright 2015 Comcast Cable Communications Management, LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/private/user/UserController.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/private/user/UserController.js b/traffic_portal/app/src/modules/private/user/UserController.js
index 60717f0..34ca4e5 100644
--- a/traffic_portal/app/src/modules/private/user/UserController.js
+++ b/traffic_portal/app/src/modules/private/user/UserController.js
@@ -1,6 +1,5 @@
 /*
 
- Copyright 2015 Comcast Cable Communications Management, LLC
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/private/user/_user.scss
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/private/user/_user.scss b/traffic_portal/app/src/modules/private/user/_user.scss
index 640f637..ccc785b 100644
--- a/traffic_portal/app/src/modules/private/user/_user.scss
+++ b/traffic_portal/app/src/modules/private/user/_user.scss
@@ -1,6 +1,5 @@
 /*
 
- Copyright 2015 Comcast Cable Communications Management, LLC
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/private/user/edit/UserEditController.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/private/user/edit/UserEditController.js b/traffic_portal/app/src/modules/private/user/edit/UserEditController.js
index e8b30c4..4eb5cb8 100644
--- a/traffic_portal/app/src/modules/private/user/edit/UserEditController.js
+++ b/traffic_portal/app/src/modules/private/user/edit/UserEditController.js
@@ -1,6 +1,5 @@
 /*
 
- Copyright 2015 Comcast Cable Communications Management, LLC
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/private/user/edit/_user.edit.scss
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/private/user/edit/_user.edit.scss b/traffic_portal/app/src/modules/private/user/edit/_user.edit.scss
index 206a312..0d2d003 100644
--- a/traffic_portal/app/src/modules/private/user/edit/_user.edit.scss
+++ b/traffic_portal/app/src/modules/private/user/edit/_user.edit.scss
@@ -1,6 +1,5 @@
 /*
 
- Copyright 2015 Comcast Cable Communications Management, LLC
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/private/user/edit/index.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/private/user/edit/index.js b/traffic_portal/app/src/modules/private/user/edit/index.js
index 9b92155..9015f48 100644
--- a/traffic_portal/app/src/modules/private/user/edit/index.js
+++ b/traffic_portal/app/src/modules/private/user/edit/index.js
@@ -1,6 +1,5 @@
 /*
 
- Copyright 2015 Comcast Cable Communications Management, LLC
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/private/user/edit/user.edit.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/private/user/edit/user.edit.tpl.html b/traffic_portal/app/src/modules/private/user/edit/user.edit.tpl.html
index b85e45c..1687963 100644
--- a/traffic_portal/app/src/modules/private/user/edit/user.edit.tpl.html
+++ b/traffic_portal/app/src/modules/private/user/edit/user.edit.tpl.html
@@ -1,6 +1,5 @@
 <!--
 
-Copyright 2015 Comcast Cable Communications Management, LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/private/user/index.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/private/user/index.js b/traffic_portal/app/src/modules/private/user/index.js
index 8471341..934212e 100644
--- a/traffic_portal/app/src/modules/private/user/index.js
+++ b/traffic_portal/app/src/modules/private/user/index.js
@@ -1,6 +1,5 @@
 /*
 
- Copyright 2015 Comcast Cable Communications Management, LLC
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/private/user/register/UserRegisterController.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/private/user/register/UserRegisterController.js b/traffic_portal/app/src/modules/private/user/register/UserRegisterController.js
index e739a84..b9e4aa5 100644
--- a/traffic_portal/app/src/modules/private/user/register/UserRegisterController.js
+++ b/traffic_portal/app/src/modules/private/user/register/UserRegisterController.js
@@ -1,6 +1,5 @@
 /*
 
- Copyright 2015 Comcast Cable Communications Management, LLC
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/private/user/register/_user.register.scss
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/private/user/register/_user.register.scss b/traffic_portal/app/src/modules/private/user/register/_user.register.scss
index aa7787c..fff23b4 100644
--- a/traffic_portal/app/src/modules/private/user/register/_user.register.scss
+++ b/traffic_portal/app/src/modules/private/user/register/_user.register.scss
@@ -1,6 +1,5 @@
 /*
 
- Copyright 2015 Comcast Cable Communications Management, LLC
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/private/user/register/index.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/private/user/register/index.js b/traffic_portal/app/src/modules/private/user/register/index.js
index 38c6a8f..933a7ad 100644
--- a/traffic_portal/app/src/modules/private/user/register/index.js
+++ b/traffic_portal/app/src/modules/private/user/register/index.js
@@ -1,6 +1,5 @@
 /*
 
- Copyright 2015 Comcast Cable Communications Management, LLC
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/private/user/reset/UserResetController.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/private/user/reset/UserResetController.js b/traffic_portal/app/src/modules/private/user/reset/UserResetController.js
index d624001..24f5e12 100644
--- a/traffic_portal/app/src/modules/private/user/reset/UserResetController.js
+++ b/traffic_portal/app/src/modules/private/user/reset/UserResetController.js
@@ -1,6 +1,5 @@
 /*
 
- Copyright 2015 Comcast Cable Communications Management, LLC
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/private/user/reset/_user.reset.scss
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/private/user/reset/_user.reset.scss b/traffic_portal/app/src/modules/private/user/reset/_user.reset.scss
index aa7787c..fff23b4 100644
--- a/traffic_portal/app/src/modules/private/user/reset/_user.reset.scss
+++ b/traffic_portal/app/src/modules/private/user/reset/_user.reset.scss
@@ -1,6 +1,5 @@
 /*
 
- Copyright 2015 Comcast Cable Communications Management, LLC
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/private/user/reset/index.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/private/user/reset/index.js b/traffic_portal/app/src/modules/private/user/reset/index.js
index e16c357..3d4af61 100644
--- a/traffic_portal/app/src/modules/private/user/reset/index.js
+++ b/traffic_portal/app/src/modules/private/user/reset/index.js
@@ -1,6 +1,5 @@
 /*
 
- Copyright 2015 Comcast Cable Communications Management, LLC
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/private/user/user.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/private/user/user.tpl.html b/traffic_portal/app/src/modules/private/user/user.tpl.html
index eedf6d3..5fe0c27 100644
--- a/traffic_portal/app/src/modules/private/user/user.tpl.html
+++ b/traffic_portal/app/src/modules/private/user/user.tpl.html
@@ -1,6 +1,5 @@
 <!--
 
-Copyright 2015 Comcast Cable Communications Management, LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/public/about/AboutController.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/public/about/AboutController.js b/traffic_portal/app/src/modules/public/about/AboutController.js
index 6593a67..9fcddb1 100644
--- a/traffic_portal/app/src/modules/public/about/AboutController.js
+++ b/traffic_portal/app/src/modules/public/about/AboutController.js
@@ -1,6 +1,5 @@
 /*
 
- Copyright 2015 Comcast Cable Communications Management, LLC
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/public/about/_about.scss
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/public/about/_about.scss b/traffic_portal/app/src/modules/public/about/_about.scss
index c3a8f26..c372d2f 100644
--- a/traffic_portal/app/src/modules/public/about/_about.scss
+++ b/traffic_portal/app/src/modules/public/about/_about.scss
@@ -1,6 +1,5 @@
 /*
 
- Copyright 2015 Comcast Cable Communications Management, LLC
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/public/about/about.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/public/about/about.tpl.html b/traffic_portal/app/src/modules/public/about/about.tpl.html
index 159458e..16d02b7 100644
--- a/traffic_portal/app/src/modules/public/about/about.tpl.html
+++ b/traffic_portal/app/src/modules/public/about/about.tpl.html
@@ -1,6 +1,5 @@
 <!--
 
-Copyright 2015 Comcast Cable Communications Management, LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/public/about/index.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/public/about/index.js b/traffic_portal/app/src/modules/public/about/index.js
index 476fd26..3ce1f0d 100644
--- a/traffic_portal/app/src/modules/public/about/index.js
+++ b/traffic_portal/app/src/modules/public/about/index.js
@@ -1,6 +1,5 @@
 /*
 
- Copyright 2015 Comcast Cable Communications Management, LLC
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/public/home/HomeController.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/public/home/HomeController.js b/traffic_portal/app/src/modules/public/home/HomeController.js
index 989ced4..c4458a6 100644
--- a/traffic_portal/app/src/modules/public/home/HomeController.js
+++ b/traffic_portal/app/src/modules/public/home/HomeController.js
@@ -1,6 +1,5 @@
 /*
 
- Copyright 2015 Comcast Cable Communications Management, LLC
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/public/home/_home.scss
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/public/home/_home.scss b/traffic_portal/app/src/modules/public/home/_home.scss
index 23ee9fb..8e1e043 100644
--- a/traffic_portal/app/src/modules/public/home/_home.scss
+++ b/traffic_portal/app/src/modules/public/home/_home.scss
@@ -1,6 +1,5 @@
 /*
 
- Copyright 2015 Comcast Cable Communications Management, LLC
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/public/home/home.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/public/home/home.tpl.html b/traffic_portal/app/src/modules/public/home/home.tpl.html
index a270209..13c6cb0 100644
--- a/traffic_portal/app/src/modules/public/home/home.tpl.html
+++ b/traffic_portal/app/src/modules/public/home/home.tpl.html
@@ -1,6 +1,5 @@
 <!--
 
-Copyright 2015 Comcast Cable Communications Management, LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/public/home/index.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/public/home/index.js b/traffic_portal/app/src/modules/public/home/index.js
index 55c2572..75a33e0 100644
--- a/traffic_portal/app/src/modules/public/home/index.js
+++ b/traffic_portal/app/src/modules/public/home/index.js
@@ -1,6 +1,5 @@
 /*
 
- Copyright 2015 Comcast Cable Communications Management, LLC
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/public/home/landing/index.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/public/home/landing/index.js b/traffic_portal/app/src/modules/public/home/landing/index.js
index f8c8de9..0a90e0a 100644
--- a/traffic_portal/app/src/modules/public/home/landing/index.js
+++ b/traffic_portal/app/src/modules/public/home/landing/index.js
@@ -1,6 +1,5 @@
 /*
 
- Copyright 2015 Comcast Cable Communications Management, LLC
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/public/index.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/public/index.js b/traffic_portal/app/src/modules/public/index.js
index a236955..5bd8b70 100644
--- a/traffic_portal/app/src/modules/public/index.js
+++ b/traffic_portal/app/src/modules/public/index.js
@@ -1,6 +1,5 @@
 /*
 
- Copyright 2015 Comcast Cable Communications Management, LLC
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/modules/public/public.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/public/public.tpl.html b/traffic_portal/app/src/modules/public/public.tpl.html
index 0dcda5d..cc9b0ef 100644
--- a/traffic_portal/app/src/modules/public/public.tpl.html
+++ b/traffic_portal/app/src/modules/public/public.tpl.html
@@ -1,6 +1,5 @@
 <!--
 
-Copyright 2015 Comcast Cable Communications Management, LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/scripts/shared-libs.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/scripts/shared-libs.js b/traffic_portal/app/src/scripts/shared-libs.js
index 6d9a81f..da55075 100755
--- a/traffic_portal/app/src/scripts/shared-libs.js
+++ b/traffic_portal/app/src/scripts/shared-libs.js
@@ -1,6 +1,5 @@
 /*
 
- Copyright 2015 Comcast Cable Communications Management, LLC
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/styles/main.scss
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/styles/main.scss b/traffic_portal/app/src/styles/main.scss
index e165080..64952d8 100755
--- a/traffic_portal/app/src/styles/main.scss
+++ b/traffic_portal/app/src/styles/main.scss
@@ -1,6 +1,5 @@
 /*
 
- Copyright 2015 Comcast Cable Communications Management, LLC
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/app/src/styles/variables.scss
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/styles/variables.scss b/traffic_portal/app/src/styles/variables.scss
index 8723140..3758dad 100755
--- a/traffic_portal/app/src/styles/variables.scss
+++ b/traffic_portal/app/src/styles/variables.scss
@@ -1,6 +1,5 @@
 /*
 
- Copyright 2015 Comcast Cable Communications Management, LLC
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/build/build_rpm.sh
----------------------------------------------------------------------
diff --git a/traffic_portal/build/build_rpm.sh b/traffic_portal/build/build_rpm.sh
index 1bc7681..2ce3c97 100755
--- a/traffic_portal/build/build_rpm.sh
+++ b/traffic_portal/build/build_rpm.sh
@@ -1,7 +1,6 @@
 #!/bin/bash
 #
 #
-# Copyright 2015 Comcast Cable Communications Management, LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/build/traffic_portal.spec
----------------------------------------------------------------------
diff --git a/traffic_portal/build/traffic_portal.spec b/traffic_portal/build/traffic_portal.spec
index 423bc69..e0a099f 100644
--- a/traffic_portal/build/traffic_portal.spec
+++ b/traffic_portal/build/traffic_portal.spec
@@ -1,5 +1,4 @@
 #
-# Copyright 2015 Comcast Cable Communications Management, LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/conf/config-template.js
----------------------------------------------------------------------
diff --git a/traffic_portal/conf/config-template.js b/traffic_portal/conf/config-template.js
index e4ade31..b7a715b 100644
--- a/traffic_portal/conf/config-template.js
+++ b/traffic_portal/conf/config-template.js
@@ -1,6 +1,5 @@
 /*
 
- Copyright 2015 Comcast Cable Communications Management, LLC
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/conf/config.js
----------------------------------------------------------------------
diff --git a/traffic_portal/conf/config.js b/traffic_portal/conf/config.js
index ed12b86..20b2c64 100644
--- a/traffic_portal/conf/config.js
+++ b/traffic_portal/conf/config.js
@@ -1,6 +1,5 @@
 /*
 
- Copyright 2015 Comcast Cable Communications Management, LLC
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/grunt/browserify2.js
----------------------------------------------------------------------
diff --git a/traffic_portal/grunt/browserify2.js b/traffic_portal/grunt/browserify2.js
index 1d79a52..122651d 100755
--- a/traffic_portal/grunt/browserify2.js
+++ b/traffic_portal/grunt/browserify2.js
@@ -1,6 +1,5 @@
 /*
 
- Copyright 2015 Comcast Cable Communications Management, LLC
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/grunt/clean.js
----------------------------------------------------------------------
diff --git a/traffic_portal/grunt/clean.js b/traffic_portal/grunt/clean.js
index 1cbcbc6..fead1ce 100755
--- a/traffic_portal/grunt/clean.js
+++ b/traffic_portal/grunt/clean.js
@@ -1,6 +1,5 @@
 /*
 
- Copyright 2015 Comcast Cable Communications Management, LLC
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/grunt/compass.js
----------------------------------------------------------------------
diff --git a/traffic_portal/grunt/compass.js b/traffic_portal/grunt/compass.js
index 443d271..5ec79fd 100755
--- a/traffic_portal/grunt/compass.js
+++ b/traffic_portal/grunt/compass.js
@@ -1,6 +1,5 @@
 /*
 
- Copyright 2015 Comcast Cable Communications Management, LLC
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/grunt/copy.js
----------------------------------------------------------------------
diff --git a/traffic_portal/grunt/copy.js b/traffic_portal/grunt/copy.js
index 5b1114b..4bee643 100755
--- a/traffic_portal/grunt/copy.js
+++ b/traffic_portal/grunt/copy.js
@@ -1,6 +1,5 @@
 /*
 
- Copyright 2015 Comcast Cable Communications Management, LLC
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/grunt/express.js
----------------------------------------------------------------------
diff --git a/traffic_portal/grunt/express.js b/traffic_portal/grunt/express.js
index 5d84eaf..aa76337 100644
--- a/traffic_portal/grunt/express.js
+++ b/traffic_portal/grunt/express.js
@@ -1,6 +1,5 @@
 /*
 
- Copyright 2015 Comcast Cable Communications Management, LLC
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/grunt/globalConfig.js
----------------------------------------------------------------------
diff --git a/traffic_portal/grunt/globalConfig.js b/traffic_portal/grunt/globalConfig.js
index 9c6bae7..9d76412 100755
--- a/traffic_portal/grunt/globalConfig.js
+++ b/traffic_portal/grunt/globalConfig.js
@@ -1,6 +1,5 @@
 /*
 
- Copyright 2015 Comcast Cable Communications Management, LLC
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/grunt/html2js.js
----------------------------------------------------------------------
diff --git a/traffic_portal/grunt/html2js.js b/traffic_portal/grunt/html2js.js
index 92c0a83..65760e5 100755
--- a/traffic_portal/grunt/html2js.js
+++ b/traffic_portal/grunt/html2js.js
@@ -1,6 +1,5 @@
 /*
 
- Copyright 2015 Comcast Cable Communications Management, LLC
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/grunt/install-dependencies.js
----------------------------------------------------------------------
diff --git a/traffic_portal/grunt/install-dependencies.js b/traffic_portal/grunt/install-dependencies.js
index 1c07426..8af5b3c 100644
--- a/traffic_portal/grunt/install-dependencies.js
+++ b/traffic_portal/grunt/install-dependencies.js
@@ -1,6 +1,5 @@
 /*
 
- Copyright 2015 Comcast Cable Communications Management, LLC
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/grunt/jshint.js
----------------------------------------------------------------------
diff --git a/traffic_portal/grunt/jshint.js b/traffic_portal/grunt/jshint.js
index c91195a..aa7be4a 100755
--- a/traffic_portal/grunt/jshint.js
+++ b/traffic_portal/grunt/jshint.js
@@ -1,6 +1,5 @@
 /*
 
- Copyright 2015 Comcast Cable Communications Management, LLC
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/grunt/ngconstant.js
----------------------------------------------------------------------
diff --git a/traffic_portal/grunt/ngconstant.js b/traffic_portal/grunt/ngconstant.js
index e042c55..356d43e 100644
--- a/traffic_portal/grunt/ngconstant.js
+++ b/traffic_portal/grunt/ngconstant.js
@@ -1,6 +1,5 @@
 /*
 
- Copyright 2015 Comcast Cable Communications Management, LLC
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/grunt/uglify.js
----------------------------------------------------------------------
diff --git a/traffic_portal/grunt/uglify.js b/traffic_portal/grunt/uglify.js
index b0bfb31..1150381 100755
--- a/traffic_portal/grunt/uglify.js
+++ b/traffic_portal/grunt/uglify.js
@@ -1,6 +1,5 @@
 /*
 
- Copyright 2015 Comcast Cable Communications Management, LLC
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/grunt/watch.js
----------------------------------------------------------------------
diff --git a/traffic_portal/grunt/watch.js b/traffic_portal/grunt/watch.js
index c9146e5..971b472 100755
--- a/traffic_portal/grunt/watch.js
+++ b/traffic_portal/grunt/watch.js
@@ -1,6 +1,5 @@
 /*
 
- Copyright 2015 Comcast Cable Communications Management, LLC
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_portal/server/server.js
----------------------------------------------------------------------
diff --git a/traffic_portal/server/server.js b/traffic_portal/server/server.js
index 476c848..34789e0 100644
--- a/traffic_portal/server/server.js
+++ b/traffic_portal/server/server.js
@@ -1,6 +1,5 @@
 /*
 
- Copyright 2015 Comcast Cable Communications Management, LLC
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/build/build_rpm.sh
----------------------------------------------------------------------
diff --git a/traffic_router/build/build_rpm.sh b/traffic_router/build/build_rpm.sh
index 8ce156a..a7fc5ff 100755
--- a/traffic_router/build/build_rpm.sh
+++ b/traffic_router/build/build_rpm.sh
@@ -1,7 +1,6 @@
 #!/bin/bash
 
 #
-# Copyright 2015 Comcast Cable Communications Management, LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/build/pom.xml
----------------------------------------------------------------------
diff --git a/traffic_router/build/pom.xml b/traffic_router/build/pom.xml
index 53781fd..fc30608 100644
--- a/traffic_router/build/pom.xml
+++ b/traffic_router/build/pom.xml
@@ -1,5 +1,4 @@
 <!--
-     Copyright 2015 Comcast Cable Communications Management, LLC
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -124,7 +123,6 @@
 							</execution>
 						</executions>
 						<configuration>
-							<copyright>2011, Comcast Converged Products</copyright>
 							<group>Applications/Internet</group>
 							<name>${project.parent.artifactId}</name>
 							<release>${env.GIT_REV_COUNT}.${buildNumber}.el6</release>

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/configuration/pom.xml
----------------------------------------------------------------------
diff --git a/traffic_router/configuration/pom.xml b/traffic_router/configuration/pom.xml
index 7d40041..5f80e15 100644
--- a/traffic_router/configuration/pom.xml
+++ b/traffic_router/configuration/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+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.
+-->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0"
 		 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/configuration/src/main/java/com/comcast/cdn/traffic_control/traffic_router/configuration/ConfigurationListener.java
----------------------------------------------------------------------
diff --git a/traffic_router/configuration/src/main/java/com/comcast/cdn/traffic_control/traffic_router/configuration/ConfigurationListener.java b/traffic_router/configuration/src/main/java/com/comcast/cdn/traffic_control/traffic_router/configuration/ConfigurationListener.java
index f0a96ea..018f7d3 100644
--- a/traffic_router/configuration/src/main/java/com/comcast/cdn/traffic_control/traffic_router/configuration/ConfigurationListener.java
+++ b/traffic_router/configuration/src/main/java/com/comcast/cdn/traffic_control/traffic_router/configuration/ConfigurationListener.java
@@ -1,5 +1,4 @@
 /*
- * Copyright 2015 Comcast Cable Communications Management, LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/connector/.classpath
----------------------------------------------------------------------
diff --git a/traffic_router/connector/.classpath b/traffic_router/connector/.classpath
index d09263d..1b128d7 100644
--- a/traffic_router/connector/.classpath
+++ b/traffic_router/connector/.classpath
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-     Copyright 2015 Comcast Cable Communications Management, LLC
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/connector/build/pmd/ruleset.xml
----------------------------------------------------------------------
diff --git a/traffic_router/connector/build/pmd/ruleset.xml b/traffic_router/connector/build/pmd/ruleset.xml
index b2bdf22..2ecc748 100644
--- a/traffic_router/connector/build/pmd/ruleset.xml
+++ b/traffic_router/connector/build/pmd/ruleset.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
 <!--
-     Copyright 2015 Comcast Cable Communications Management, LLC
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/connector/pom.xml
----------------------------------------------------------------------
diff --git a/traffic_router/connector/pom.xml b/traffic_router/connector/pom.xml
index 224e630..74e0a07 100644
--- a/traffic_router/connector/pom.xml
+++ b/traffic_router/connector/pom.xml
@@ -1,5 +1,4 @@
 <!--
-     Copyright 2015 Comcast Cable Communications Management, LLC
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/LanguidPoller.java
----------------------------------------------------------------------
diff --git a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/LanguidPoller.java b/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/LanguidPoller.java
index 4e366f2..cf07128 100644
--- a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/LanguidPoller.java
+++ b/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/LanguidPoller.java
@@ -1,5 +1,4 @@
 /*
- * Copyright 2015 Comcast Cable Communications Management, LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/LanguidProtocol.java
----------------------------------------------------------------------
diff --git a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/LanguidProtocol.java b/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/LanguidProtocol.java
index 1a81e54..cb624b2 100644
--- a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/LanguidProtocol.java
+++ b/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/LanguidProtocol.java
@@ -1,5 +1,4 @@
 /*
- * Copyright 2015 Comcast Cable Communications Management, LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/RouterJsseFactory.java
----------------------------------------------------------------------
diff --git a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/RouterJsseFactory.java b/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/RouterJsseFactory.java
index 22396f1..56f9dcc 100644
--- a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/RouterJsseFactory.java
+++ b/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/RouterJsseFactory.java
@@ -1,5 +1,4 @@
 /*
- * Copyright 2016 Comcast Cable Communications Management, LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/RouterSslImplementation.java
----------------------------------------------------------------------
diff --git a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/RouterSslImplementation.java b/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/RouterSslImplementation.java
index 7dc5015..a5a17c7 100644
--- a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/RouterSslImplementation.java
+++ b/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/RouterSslImplementation.java
@@ -1,5 +1,4 @@
 /*
- * Copyright 2016 Comcast Cable Communications Management, LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/RouterSslServerSocketFactory.java
----------------------------------------------------------------------
diff --git a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/RouterSslServerSocketFactory.java b/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/RouterSslServerSocketFactory.java
index a9b17e8..be6560e 100644
--- a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/RouterSslServerSocketFactory.java
+++ b/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/RouterSslServerSocketFactory.java
@@ -1,5 +1,4 @@
 /*
- * Copyright 2016 Comcast Cable Communications Management, LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/CertificateDataConverter.java
----------------------------------------------------------------------
diff --git a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/CertificateDataConverter.java b/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/CertificateDataConverter.java
index b867613..6139c82 100644
--- a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/CertificateDataConverter.java
+++ b/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/CertificateDataConverter.java
@@ -1,5 +1,4 @@
 /*
- * Copyright 2016 Comcast Cable Communications Management, LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/CertificateDataListener.java
----------------------------------------------------------------------
diff --git a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/CertificateDataListener.java b/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/CertificateDataListener.java
index 918d216..336acf7 100644
--- a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/CertificateDataListener.java
+++ b/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/CertificateDataListener.java
@@ -1,5 +1,4 @@
 /*
- * Copyright 2016 Comcast Cable Communications Management, LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/CertificateDecoder.java
----------------------------------------------------------------------
diff --git a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/CertificateDecoder.java b/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/CertificateDecoder.java
index 4a15bec..5694045 100644
--- a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/CertificateDecoder.java
+++ b/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/CertificateDecoder.java
@@ -1,5 +1,4 @@
 /*
- * Copyright 2016 Comcast Cable Communications Management, LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/CertificateRegistry.java
----------------------------------------------------------------------
diff --git a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/CertificateRegistry.java b/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/CertificateRegistry.java
index 7e2b13e..c3c7470 100644
--- a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/CertificateRegistry.java
+++ b/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/CertificateRegistry.java
@@ -1,5 +1,4 @@
 /*
- * Copyright 2016 Comcast Cable Communications Management, LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/HandshakeData.java
----------------------------------------------------------------------
diff --git a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/HandshakeData.java b/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/HandshakeData.java
index 0d60578..3e85d60 100644
--- a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/HandshakeData.java
+++ b/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/HandshakeData.java
@@ -1,5 +1,4 @@
 /*
- * Copyright 2016 Comcast Cable Communications Management, LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/KeyManager.java
----------------------------------------------------------------------
diff --git a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/KeyManager.java b/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/KeyManager.java
index 2073f1f..2eeb222 100644
--- a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/KeyManager.java
+++ b/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/KeyManager.java
@@ -1,5 +1,4 @@
 /*
- * Copyright 2016 Comcast Cable Communications Management, LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/Pkcs.java
----------------------------------------------------------------------
diff --git a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/Pkcs.java b/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/Pkcs.java
index f8683c8..7625dff 100644
--- a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/Pkcs.java
+++ b/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/Pkcs.java
@@ -1,5 +1,4 @@
 /*
- * Copyright 2016 Comcast Cable Communications Management, LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/Pkcs1.java
----------------------------------------------------------------------
diff --git a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/Pkcs1.java b/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/Pkcs1.java
index 6d8d84b..b652d92 100644
--- a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/Pkcs1.java
+++ b/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/Pkcs1.java
@@ -1,5 +1,4 @@
 /*
- * Copyright 2016 Comcast Cable Communications Management, LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/Pkcs8.java
----------------------------------------------------------------------
diff --git a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/Pkcs8.java b/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/Pkcs8.java
index a923cce..b65a826 100644
--- a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/Pkcs8.java
+++ b/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/Pkcs8.java
@@ -1,5 +1,4 @@
 /*
- * Copyright 2016 Comcast Cable Communications Management, LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/PrivateKeyDecoder.java
----------------------------------------------------------------------
diff --git a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/PrivateKeyDecoder.java b/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/PrivateKeyDecoder.java
index 29f2027..3792d85 100644
--- a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/PrivateKeyDecoder.java
+++ b/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/PrivateKeyDecoder.java
@@ -1,5 +1,4 @@
 /*
- * Copyright 2016 Comcast Cable Communications Management, LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/tomcat/TomcatLifecycleListener.java
----------------------------------------------------------------------
diff --git a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/tomcat/TomcatLifecycleListener.java b/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/tomcat/TomcatLifecycleListener.java
index 2b7851e..0abd45f 100644
--- a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/tomcat/TomcatLifecycleListener.java
+++ b/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/tomcat/TomcatLifecycleListener.java
@@ -1,5 +1,4 @@
 /*
- * Copyright 2016 Comcast Cable Communications Management, LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/connector/src/test/java/protocol/RouterSslImplementationTest.java
----------------------------------------------------------------------
diff --git a/traffic_router/connector/src/test/java/protocol/RouterSslImplementationTest.java b/traffic_router/connector/src/test/java/protocol/RouterSslImplementationTest.java
index 44bd224..438096a 100644
--- a/traffic_router/connector/src/test/java/protocol/RouterSslImplementationTest.java
+++ b/traffic_router/connector/src/test/java/protocol/RouterSslImplementationTest.java
@@ -1,5 +1,4 @@
 /*
- * Copyright 2016 Comcast Cable Communications Management, LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/connector/src/test/java/protocol/RouterSslServerSocketFactoryTest.java
----------------------------------------------------------------------
diff --git a/traffic_router/connector/src/test/java/protocol/RouterSslServerSocketFactoryTest.java b/traffic_router/connector/src/test/java/protocol/RouterSslServerSocketFactoryTest.java
index ab9f81e..641f5d3 100644
--- a/traffic_router/connector/src/test/java/protocol/RouterSslServerSocketFactoryTest.java
+++ b/traffic_router/connector/src/test/java/protocol/RouterSslServerSocketFactoryTest.java
@@ -1,5 +1,4 @@
 /*
- * Copyright 2016 Comcast Cable Communications Management, LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/connector/src/test/java/secure/CertificateDataConverterTest.java
----------------------------------------------------------------------
diff --git a/traffic_router/connector/src/test/java/secure/CertificateDataConverterTest.java b/traffic_router/connector/src/test/java/secure/CertificateDataConverterTest.java
index fa74847..6de4ae9 100644
--- a/traffic_router/connector/src/test/java/secure/CertificateDataConverterTest.java
+++ b/traffic_router/connector/src/test/java/secure/CertificateDataConverterTest.java
@@ -1,5 +1,4 @@
 /*
- * Copyright 2016 Comcast Cable Communications Management, LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/connector/src/test/java/secure/CertificateDataListenerTest.java
----------------------------------------------------------------------
diff --git a/traffic_router/connector/src/test/java/secure/CertificateDataListenerTest.java b/traffic_router/connector/src/test/java/secure/CertificateDataListenerTest.java
index d71799c..f08f53d 100644
--- a/traffic_router/connector/src/test/java/secure/CertificateDataListenerTest.java
+++ b/traffic_router/connector/src/test/java/secure/CertificateDataListenerTest.java
@@ -1,5 +1,4 @@
 /*
- * Copyright 2016 Comcast Cable Communications Management, LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/connector/src/test/java/secure/CertificateRegistryTest.java
----------------------------------------------------------------------
diff --git a/traffic_router/connector/src/test/java/secure/CertificateRegistryTest.java b/traffic_router/connector/src/test/java/secure/CertificateRegistryTest.java
index f83f649..555e4ab 100644
--- a/traffic_router/connector/src/test/java/secure/CertificateRegistryTest.java
+++ b/traffic_router/connector/src/test/java/secure/CertificateRegistryTest.java
@@ -1,5 +1,4 @@
 /*
- * Copyright 2016 Comcast Cable Communications Management, LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/connector/src/test/java/secure/KeyManagerTest.java
----------------------------------------------------------------------
diff --git a/traffic_router/connector/src/test/java/secure/KeyManagerTest.java b/traffic_router/connector/src/test/java/secure/KeyManagerTest.java
index 3eb20f7..498b49a 100644
--- a/traffic_router/connector/src/test/java/secure/KeyManagerTest.java
+++ b/traffic_router/connector/src/test/java/secure/KeyManagerTest.java
@@ -1,5 +1,4 @@
 /*
- * Copyright 2016 Comcast Cable Communications Management, LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/connector/src/test/java/secure/TomcatLifecycleListenerTest.java
----------------------------------------------------------------------
diff --git a/traffic_router/connector/src/test/java/secure/TomcatLifecycleListenerTest.java b/traffic_router/connector/src/test/java/secure/TomcatLifecycleListenerTest.java
index 6b1aa51..b20e1b5 100644
--- a/traffic_router/connector/src/test/java/secure/TomcatLifecycleListenerTest.java
+++ b/traffic_router/connector/src/test/java/secure/TomcatLifecycleListenerTest.java
@@ -1,5 +1,4 @@
 /*
- * Copyright 2016 Comcast Cable Communications Management, LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/build/pmd/ruleset.xml
----------------------------------------------------------------------
diff --git a/traffic_router/core/build/pmd/ruleset.xml b/traffic_router/core/build/pmd/ruleset.xml
index b72b217..dcbc791 100644
--- a/traffic_router/core/build/pmd/ruleset.xml
+++ b/traffic_router/core/build/pmd/ruleset.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
 <!--
-     Copyright 2015 Comcast Cable Communications Management, LLC
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/pom.xml
----------------------------------------------------------------------
diff --git a/traffic_router/core/pom.xml b/traffic_router/core/pom.xml
index ea99102..f2ec0cd 100644
--- a/traffic_router/core/pom.xml
+++ b/traffic_router/core/pom.xml
@@ -1,5 +1,4 @@
 <!--
-     Copyright 2015 Comcast Cable Communications Management, LLC
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/conf/cache.properties
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/conf/cache.properties b/traffic_router/core/src/main/conf/cache.properties
index 3fca1f1..2175fb0 100644
--- a/traffic_router/core/src/main/conf/cache.properties
+++ b/traffic_router/core/src/main/conf/cache.properties
@@ -1,5 +1,4 @@
 #
-# Copyright 2015 Comcast Cable Communications Management, LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/conf/dns.properties
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/conf/dns.properties b/traffic_router/core/src/main/conf/dns.properties
index fa5bb5b..19f06be 100644
--- a/traffic_router/core/src/main/conf/dns.properties
+++ b/traffic_router/core/src/main/conf/dns.properties
@@ -1,5 +1,4 @@
 #
-# Copyright 2015 Comcast Cable Communications Management, LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/conf/http.properties
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/conf/http.properties b/traffic_router/core/src/main/conf/http.properties
index 8d644b5..366d566 100644
--- a/traffic_router/core/src/main/conf/http.properties
+++ b/traffic_router/core/src/main/conf/http.properties
@@ -1,5 +1,4 @@
 #
-# Copyright 2015 Comcast Cable Communications Management, LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/conf/log4j.properties
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/conf/log4j.properties b/traffic_router/core/src/main/conf/log4j.properties
index b6d65fa..60bd5d3 100644
--- a/traffic_router/core/src/main/conf/log4j.properties
+++ b/traffic_router/core/src/main/conf/log4j.properties
@@ -1,5 +1,4 @@
 #
-# Copyright 2015 Comcast Cable Communications Management, LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/conf/traffic_monitor.properties
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/conf/traffic_monitor.properties b/traffic_router/core/src/main/conf/traffic_monitor.properties
index d60dbd7..e044ddd 100644
--- a/traffic_router/core/src/main/conf/traffic_monitor.properties
+++ b/traffic_router/core/src/main/conf/traffic_monitor.properties
@@ -1,5 +1,4 @@
 #
-# Copyright 2015 Comcast Cable Communications Management, LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/conf/traffic_ops.properties
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/conf/traffic_ops.properties b/traffic_router/core/src/main/conf/traffic_ops.properties
index e4e6730..1118538 100644
--- a/traffic_router/core/src/main/conf/traffic_ops.properties
+++ b/traffic_router/core/src/main/conf/traffic_ops.properties
@@ -1,5 +1,4 @@
 #
-# Copyright 2015 Comcast Cable Communications Management, LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/etc/init.d/tomcat
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/etc/init.d/tomcat b/traffic_router/core/src/main/etc/init.d/tomcat
index 70428bf..caaff69 100644
--- a/traffic_router/core/src/main/etc/init.d/tomcat
+++ b/traffic_router/core/src/main/etc/init.d/tomcat
@@ -1,6 +1,5 @@
 #!/bin/sh
 #
-# Copyright 2015 Comcast Cable Communications Management, LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/ConsistentHashController.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/ConsistentHashController.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/ConsistentHashController.java
index d9d4c6f..42e2108 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/ConsistentHashController.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/ConsistentHashController.java
@@ -1,5 +1,4 @@
 /*
- * Copyright 2016 Comcast Cable Communications Management, LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/CoverageZoneController.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/CoverageZoneController.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/CoverageZoneController.java
index 9bf2840..b47743f 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/CoverageZoneController.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/CoverageZoneController.java
@@ -1,5 +1,4 @@
 /*
- * Copyright 2016 Comcast Cable Communications Management, LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/DeliveryServicesController.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/DeliveryServicesController.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/DeliveryServicesController.java
index 9eb2aec..4e5213b 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/DeliveryServicesController.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/DeliveryServicesController.java
@@ -1,5 +1,4 @@
 /*
- * Copyright 2016 Comcast Cable Communications Management, LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/LocationController.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/LocationController.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/LocationController.java
index c613d7b..78acfe9 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/LocationController.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/LocationController.java
@@ -1,5 +1,4 @@
 /*
- * Copyright 2015 Comcast Cable Communications Management, LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/StatsController.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/StatsController.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/StatsController.java
index 3ada1df..ed1e4c7 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/StatsController.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/StatsController.java
@@ -1,5 +1,4 @@
 /*
- * Copyright 2015 Comcast Cable Communications Management, LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/SteeringController.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/SteeringController.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/SteeringController.java
index e7e160c..60fbb67 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/SteeringController.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/SteeringController.java
@@ -1,5 +1,4 @@
 /*
- * Copyright 2015 Comcast Cable Communications Management, LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/ZonesController.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/ZonesController.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/ZonesController.java
index a2abc8f..c7f5633 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/ZonesController.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/ZonesController.java
@@ -1,5 +1,4 @@
 /*
- * Copyright 2015 Comcast Cable Communications Management, LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/cache/Cache.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/cache/Cache.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/cache/Cache.java
index c232a30..27a75c4 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/cache/Cache.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/cache/Cache.java
@@ -1,5 +1,4 @@
 /*
- * Copyright 2015 Comcast Cable Communications Management, LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/cache/CacheLocation.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/cache/CacheLocation.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/cache/CacheLocation.java
index be9942a..e2bf78d 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/cache/CacheLocation.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/cache/CacheLocation.java
@@ -1,5 +1,4 @@
 /*
- * Copyright 2015 Comcast Cable Communications Management, LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/cache/CacheLocationManager.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/cache/CacheLocationManager.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/cache/CacheLocationManager.java
index 2f92f56..e3de4f1 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/cache/CacheLocationManager.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/cache/CacheLocationManager.java
@@ -1,5 +1,4 @@
 /*
- * Copyright 2015 Comcast Cable Communications Management, LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/cache/CacheRegister.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/cache/CacheRegister.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/cache/CacheRegister.java
index ed6a963..cf13778 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/cache/CacheRegister.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/cache/CacheRegister.java
@@ -1,5 +1,4 @@
 /*
- * Copyright 2015 Comcast Cable Communications Management, LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/cache/InetRecord.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/cache/InetRecord.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/cache/InetRecord.java
index 2ca799a..f30dd85 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/cache/InetRecord.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/cache/InetRecord.java
@@ -1,5 +1,4 @@
 /*
- * Copyright 2015 Comcast Cable Communications Management, LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/cache/Resolver.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/cache/Resolver.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/cache/Resolver.java
index 98a8b65..56c25a1 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/cache/Resolver.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/cache/Resolver.java
@@ -1,5 +1,4 @@
 /*
- * Copyright 2015 Comcast Cable Communications Management, LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/config/CertificateChecker.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/config/CertificateChecker.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/config/CertificateChecker.java
index eb775a7..f6601c9 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/config/CertificateChecker.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/config/CertificateChecker.java
@@ -1,5 +1,4 @@
 /*
- * Copyright 2016 Comcast Cable Communications Management, LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/config/ConfigHandler.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/config/ConfigHandler.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/config/ConfigHandler.java
index cc84b71..ed61c56 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/config/ConfigHandler.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/config/ConfigHandler.java
@@ -1,5 +1,4 @@
 /*
- * Copyright 2015 Comcast Cable Communications Management, LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/config/ParseException.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/config/ParseException.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/config/ParseException.java
index 90756fc..12e7de9 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/config/ParseException.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/config/ParseException.java
@@ -1,5 +1,4 @@
 /*
- * Copyright 2015 Comcast Cable Communications Management, LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.