Update copyright headers

96 files changed, 96 insertions, 90 deletions

diff --git a/fastlib/CMakeLists.txt b/fastlib/CMakeLists.txt
index 782c00ecf60..1d1ff42106b 100644
--- a/fastlib/CMakeLists.txt
+++ b/fastlib/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 vespa_define_module(
     DEPENDS
     fastos
diff --git a/fastlib/common_config/install.sh b/fastlib/common_config/install.sh
index 7bf8657ade3..7c1b0e754d3 100644
--- a/fastlib/common_config/install.sh
+++ b/fastlib/common_config/install.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
-# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 cd src/cpp
 make FASTOS_DIR=${autobuild_installroot} INSTALL_DIR=${autobuild_installroot} install
diff --git a/fastlib/common_config/make.sh b/fastlib/common_config/make.sh
index 85932c4401a..53ca793f16c 100644
--- a/fastlib/common_config/make.sh
+++ b/fastlib/common_config/make.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
-# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 cd src/cpp
 make FASTOS_DIR=${autobuild_installroot} INSTALL_DIR=${autobuild_installroot}
diff --git a/fastlib/current/release/buildspec b/fastlib/current/release/buildspec
index 343ef61aade..8ef291ecb02 100644
--- a/fastlib/current/release/buildspec
+++ b/fastlib/current/release/buildspec
@@ -1,3 +1,4 @@
+# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 # Config file added by mkspec
 # Added by oholsen 
 $fastlib_about="FAST standard library classes";
diff --git a/fastlib/src/Doxyfile b/fastlib/src/Doxyfile
index 3e3092c715a..9df5dff13b3 100644
--- a/fastlib/src/Doxyfile
+++ b/fastlib/src/Doxyfile
@@ -1,4 +1,4 @@
-# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 # Doxyfile 1.3.3
 
 # This file describes the settings to be used by the documentation system
diff --git a/fastlib/src/vespa/fastlib/io/CMakeLists.txt b/fastlib/src/vespa/fastlib/io/CMakeLists.txt
index b90ff90257b..8c45940e4c1 100644
--- a/fastlib/src/vespa/fastlib/io/CMakeLists.txt
+++ b/fastlib/src/vespa/fastlib/io/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 vespa_add_library(fastlib_io
     SOURCES
     fileinputstream.cpp
diff --git a/fastlib/src/vespa/fastlib/io/bufferedfile.cpp b/fastlib/src/vespa/fastlib/io/bufferedfile.cpp
index 04376826139..26c75cc1fb1 100644
--- a/fastlib/src/vespa/fastlib/io/bufferedfile.cpp
+++ b/fastlib/src/vespa/fastlib/io/bufferedfile.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "bufferedfile.h"
 
diff --git a/fastlib/src/vespa/fastlib/io/bufferedfile.h b/fastlib/src/vespa/fastlib/io/bufferedfile.h
index 7afd4ab93e8..fcd297bc414 100644
--- a/fastlib/src/vespa/fastlib/io/bufferedfile.h
+++ b/fastlib/src/vespa/fastlib/io/bufferedfile.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 //************************************************************************
 /**
  * Class definitions for Fast_BufferedInputStream
diff --git a/fastlib/src/vespa/fastlib/io/bufferedinputstream.cpp b/fastlib/src/vespa/fastlib/io/bufferedinputstream.cpp
index dd212ddfd08..f536a88913e 100644
--- a/fastlib/src/vespa/fastlib/io/bufferedinputstream.cpp
+++ b/fastlib/src/vespa/fastlib/io/bufferedinputstream.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "bufferedinputstream.h"
 #include <cstring>
diff --git a/fastlib/src/vespa/fastlib/io/bufferedinputstream.h b/fastlib/src/vespa/fastlib/io/bufferedinputstream.h
index 8d98abfff33..e52fe625b85 100644
--- a/fastlib/src/vespa/fastlib/io/bufferedinputstream.h
+++ b/fastlib/src/vespa/fastlib/io/bufferedinputstream.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #pragma once
 
 #include <vespa/fastlib/io/filterinputstream.h>
diff --git a/fastlib/src/vespa/fastlib/io/bufferedoutputstream.cpp b/fastlib/src/vespa/fastlib/io/bufferedoutputstream.cpp
index 7377c666cf4..fff52b5c363 100644
--- a/fastlib/src/vespa/fastlib/io/bufferedoutputstream.cpp
+++ b/fastlib/src/vespa/fastlib/io/bufferedoutputstream.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 /**
 *******************************************************************************
 *
diff --git a/fastlib/src/vespa/fastlib/io/bufferedoutputstream.h b/fastlib/src/vespa/fastlib/io/bufferedoutputstream.h
index aabc787543e..86cd6a41a25 100644
--- a/fastlib/src/vespa/fastlib/io/bufferedoutputstream.h
+++ b/fastlib/src/vespa/fastlib/io/bufferedoutputstream.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #pragma once
 
diff --git a/fastlib/src/vespa/fastlib/io/fileinputstream.cpp b/fastlib/src/vespa/fastlib/io/fileinputstream.cpp
index 2d00935df79..c9a7cc753b5 100644
--- a/fastlib/src/vespa/fastlib/io/fileinputstream.cpp
+++ b/fastlib/src/vespa/fastlib/io/fileinputstream.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 /**
 *******************************************************************************
 *
diff --git a/fastlib/src/vespa/fastlib/io/fileinputstream.h b/fastlib/src/vespa/fastlib/io/fileinputstream.h
index 58662ba75c7..e3cd65ab321 100644
--- a/fastlib/src/vespa/fastlib/io/fileinputstream.h
+++ b/fastlib/src/vespa/fastlib/io/fileinputstream.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #pragma once
 
diff --git a/fastlib/src/vespa/fastlib/io/fileoutputstream.cpp b/fastlib/src/vespa/fastlib/io/fileoutputstream.cpp
index 8f5e3f4f71b..649a1852ecf 100644
--- a/fastlib/src/vespa/fastlib/io/fileoutputstream.cpp
+++ b/fastlib/src/vespa/fastlib/io/fileoutputstream.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 /**
 *******************************************************************************
 *
diff --git a/fastlib/src/vespa/fastlib/io/fileoutputstream.h b/fastlib/src/vespa/fastlib/io/fileoutputstream.h
index af7db086ed9..39de14cc6d1 100644
--- a/fastlib/src/vespa/fastlib/io/fileoutputstream.h
+++ b/fastlib/src/vespa/fastlib/io/fileoutputstream.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #pragma once
 
diff --git a/fastlib/src/vespa/fastlib/io/filterinputstream.h b/fastlib/src/vespa/fastlib/io/filterinputstream.h
index 20a9e544fb7..55b705eba63 100644
--- a/fastlib/src/vespa/fastlib/io/filterinputstream.h
+++ b/fastlib/src/vespa/fastlib/io/filterinputstream.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 /**
 *******************************************************************************
 *
diff --git a/fastlib/src/vespa/fastlib/io/filteroutputstream.h b/fastlib/src/vespa/fastlib/io/filteroutputstream.h
index 8a778ddd38f..f65aa70c851 100644
--- a/fastlib/src/vespa/fastlib/io/filteroutputstream.h
+++ b/fastlib/src/vespa/fastlib/io/filteroutputstream.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #pragma once
 
diff --git a/fastlib/src/vespa/fastlib/io/inputstream.h b/fastlib/src/vespa/fastlib/io/inputstream.h
index 61026172a95..9b45d62f923 100644
--- a/fastlib/src/vespa/fastlib/io/inputstream.h
+++ b/fastlib/src/vespa/fastlib/io/inputstream.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #pragma once
 
 #include <sys/types.h>
diff --git a/fastlib/src/vespa/fastlib/io/outputstream.h b/fastlib/src/vespa/fastlib/io/outputstream.h
index ba4d74f1a7a..78eb93fac0f 100644
--- a/fastlib/src/vespa/fastlib/io/outputstream.h
+++ b/fastlib/src/vespa/fastlib/io/outputstream.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 /**
 *******************************************************************************
 *
diff --git a/fastlib/src/vespa/fastlib/io/tests/CMakeLists.txt b/fastlib/src/vespa/fastlib/io/tests/CMakeLists.txt
index 29912156b59..9b0daa49cba 100644
--- a/fastlib/src/vespa/fastlib/io/tests/CMakeLists.txt
+++ b/fastlib/src/vespa/fastlib/io/tests/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 vespa_add_executable(fastlib_bufferedstreamtest_app TEST
     SOURCES
     bufferedstreamtest.cpp
diff --git a/fastlib/src/vespa/fastlib/io/tests/bufferedfiletest.cpp b/fastlib/src/vespa/fastlib/io/tests/bufferedfiletest.cpp
index 1a60a80dd7c..aeb37cfd903 100644
--- a/fastlib/src/vespa/fastlib/io/tests/bufferedfiletest.cpp
+++ b/fastlib/src/vespa/fastlib/io/tests/bufferedfiletest.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #include <vespa/fastlib/io/bufferedfile.h>
 #include <vespa/vespalib/testkit/test_kit.h>
 
diff --git a/fastlib/src/vespa/fastlib/io/tests/bufferedstreamtest.cpp b/fastlib/src/vespa/fastlib/io/tests/bufferedstreamtest.cpp
index e5f780c1ac0..c67a513c67b 100644
--- a/fastlib/src/vespa/fastlib/io/tests/bufferedstreamtest.cpp
+++ b/fastlib/src/vespa/fastlib/io/tests/bufferedstreamtest.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #include <cassert>
 #include <ctime>
 #include <iostream>
diff --git a/fastlib/src/vespa/fastlib/net/CMakeLists.txt b/fastlib/src/vespa/fastlib/net/CMakeLists.txt
index 4aec801cfe9..78d24473dd6 100644
--- a/fastlib/src/vespa/fastlib/net/CMakeLists.txt
+++ b/fastlib/src/vespa/fastlib/net/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 vespa_add_library(fastlib_net OBJECT
     SOURCES
     httpserver.cpp
diff --git a/fastlib/src/vespa/fastlib/net/httpchunkedinputstream.cpp b/fastlib/src/vespa/fastlib/net/httpchunkedinputstream.cpp
index e7386dcc3f4..123f34fdd4d 100644
--- a/fastlib/src/vespa/fastlib/net/httpchunkedinputstream.cpp
+++ b/fastlib/src/vespa/fastlib/net/httpchunkedinputstream.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 /**
 *******************************************************************************
 *
diff --git a/fastlib/src/vespa/fastlib/net/httpchunkedinputstream.h b/fastlib/src/vespa/fastlib/net/httpchunkedinputstream.h
index 5517e912637..a6448419744 100644
--- a/fastlib/src/vespa/fastlib/net/httpchunkedinputstream.h
+++ b/fastlib/src/vespa/fastlib/net/httpchunkedinputstream.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #pragma once
 
diff --git a/fastlib/src/vespa/fastlib/net/httpchunkedoutputstream.cpp b/fastlib/src/vespa/fastlib/net/httpchunkedoutputstream.cpp
index 915d8e69223..673cbe4eca5 100644
--- a/fastlib/src/vespa/fastlib/net/httpchunkedoutputstream.cpp
+++ b/fastlib/src/vespa/fastlib/net/httpchunkedoutputstream.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 /**
 *******************************************************************************
 *
diff --git a/fastlib/src/vespa/fastlib/net/httpchunkedoutputstream.h b/fastlib/src/vespa/fastlib/net/httpchunkedoutputstream.h
index f54b6c06922..dfd58aa2612 100644
--- a/fastlib/src/vespa/fastlib/net/httpchunkedoutputstream.h
+++ b/fastlib/src/vespa/fastlib/net/httpchunkedoutputstream.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #pragma once
 
diff --git a/fastlib/src/vespa/fastlib/net/httpheaderparser.cpp b/fastlib/src/vespa/fastlib/net/httpheaderparser.cpp
index 86fe3feabcf..1ef6e105ef1 100644
--- a/fastlib/src/vespa/fastlib/net/httpheaderparser.cpp
+++ b/fastlib/src/vespa/fastlib/net/httpheaderparser.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "httpheaderparser.h"
 #include <vespa/fastlib/io/bufferedinputstream.h>
diff --git a/fastlib/src/vespa/fastlib/net/httpheaderparser.h b/fastlib/src/vespa/fastlib/net/httpheaderparser.h
index 94f6bccbdb4..f7146f3618b 100644
--- a/fastlib/src/vespa/fastlib/net/httpheaderparser.h
+++ b/fastlib/src/vespa/fastlib/net/httpheaderparser.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #pragma once
 
diff --git a/fastlib/src/vespa/fastlib/net/httpserver.cpp b/fastlib/src/vespa/fastlib/net/httpserver.cpp
index c5570356707..cd3b7705cff 100644
--- a/fastlib/src/vespa/fastlib/net/httpserver.cpp
+++ b/fastlib/src/vespa/fastlib/net/httpserver.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "url.h"
 #include "httpchunkedinputstream.h"
diff --git a/fastlib/src/vespa/fastlib/net/httpserver.h b/fastlib/src/vespa/fastlib/net/httpserver.h
index 8304fadd9bb..9f320924e34 100644
--- a/fastlib/src/vespa/fastlib/net/httpserver.h
+++ b/fastlib/src/vespa/fastlib/net/httpserver.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 /**
 *******************************************************************************
 *
diff --git a/fastlib/src/vespa/fastlib/net/socket.cpp b/fastlib/src/vespa/fastlib/net/socket.cpp
index be463088bb3..aaab1984544 100644
--- a/fastlib/src/vespa/fastlib/net/socket.cpp
+++ b/fastlib/src/vespa/fastlib/net/socket.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "socket.h"
 
diff --git a/fastlib/src/vespa/fastlib/net/socket.h b/fastlib/src/vespa/fastlib/net/socket.h
index f784c4d606c..7328d12b25b 100644
--- a/fastlib/src/vespa/fastlib/net/socket.h
+++ b/fastlib/src/vespa/fastlib/net/socket.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #pragma once
 
 #include <vespa/fastlib/io/inputstream.h>
diff --git a/fastlib/src/vespa/fastlib/net/tests/CMakeLists.txt b/fastlib/src/vespa/fastlib/net/tests/CMakeLists.txt
index 72957df223e..1c05a2fc5fb 100644
--- a/fastlib/src/vespa/fastlib/net/tests/CMakeLists.txt
+++ b/fastlib/src/vespa/fastlib/net/tests/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 vespa_add_executable(fastlib_httpheaderparsertest_app TEST
     SOURCES
     httpheaderparsertest.cpp
diff --git a/fastlib/src/vespa/fastlib/net/tests/httpheaderparsertest.cpp b/fastlib/src/vespa/fastlib/net/tests/httpheaderparsertest.cpp
index 8124ed63966..9a0b1450454 100644
--- a/fastlib/src/vespa/fastlib/net/tests/httpheaderparsertest.cpp
+++ b/fastlib/src/vespa/fastlib/net/tests/httpheaderparsertest.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #include <vespa/fastos/app.h>
 #include <vespa/fastlib/net/httpheaderparser.h>
 #include <vespa/fastlib/io/fileinputstream.h>
diff --git a/fastlib/src/vespa/fastlib/net/url.cpp b/fastlib/src/vespa/fastlib/net/url.cpp
index a62a5171983..4f7fe74ab4e 100644
--- a/fastlib/src/vespa/fastlib/net/url.cpp
+++ b/fastlib/src/vespa/fastlib/net/url.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 /**
  *
  * @file url.cpp
diff --git a/fastlib/src/vespa/fastlib/net/url.h b/fastlib/src/vespa/fastlib/net/url.h
index 5aec3208af2..4cc25f8b58d 100644
--- a/fastlib/src/vespa/fastlib/net/url.h
+++ b/fastlib/src/vespa/fastlib/net/url.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 /**
  *
  * @file url.h
diff --git a/fastlib/src/vespa/fastlib/testsuite/CMakeLists.txt b/fastlib/src/vespa/fastlib/testsuite/CMakeLists.txt
index 08df1db0b78..4bd50637ff0 100644
--- a/fastlib/src/vespa/fastlib/testsuite/CMakeLists.txt
+++ b/fastlib/src/vespa/fastlib/testsuite/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 vespa_add_library(fastlib_fast_testsuite
     SOURCES
     suite.cpp
diff --git a/fastlib/src/vespa/fastlib/testsuite/cpptest.el b/fastlib/src/vespa/fastlib/testsuite/cpptest.el
index d0a4f5c839a..f5014fc6ee6 100644
--- a/fastlib/src/vespa/fastlib/testsuite/cpptest.el
+++ b/fastlib/src/vespa/fastlib/testsuite/cpptest.el
@@ -1,3 +1,4 @@
+;; Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 ;; cpptest.el --- C++ unit test support for c++-mode
 
 ;; $Revision: 1.179 $ $Date: 2004-02-17 17:01:15 $
diff --git a/fastlib/src/vespa/fastlib/testsuite/suite.h b/fastlib/src/vespa/fastlib/testsuite/suite.h
index 841dc1fc347..94c629f5d2c 100644
--- a/fastlib/src/vespa/fastlib/testsuite/suite.h
+++ b/fastlib/src/vespa/fastlib/testsuite/suite.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 /**************************************************************************
  * @author Bård Kvalheim
  *
diff --git a/fastlib/src/vespa/fastlib/testsuite/test.cpp b/fastlib/src/vespa/fastlib/testsuite/test.cpp
index dce4a24ea71..d7541d163e7 100644
--- a/fastlib/src/vespa/fastlib/testsuite/test.cpp
+++ b/fastlib/src/vespa/fastlib/testsuite/test.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "test.h"
 
diff --git a/fastlib/src/vespa/fastlib/testsuite/test.h b/fastlib/src/vespa/fastlib/testsuite/test.h
index 414131814eb..7ee04984da0 100644
--- a/fastlib/src/vespa/fastlib/testsuite/test.h
+++ b/fastlib/src/vespa/fastlib/testsuite/test.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 /**************************************************************************
  * @author Bård Kvalheim
  *
diff --git a/fastlib/src/vespa/fastlib/testsuite/testproject.el b/fastlib/src/vespa/fastlib/testsuite/testproject.el
index 0a7ed652378..14cec6eb31c 100644
--- a/fastlib/src/vespa/fastlib/testsuite/testproject.el
+++ b/fastlib/src/vespa/fastlib/testsuite/testproject.el
@@ -1,3 +1,4 @@
+;; Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 ;; testproject.el
 
 ;; Local configurations for the cpptest Emacs unit-test
diff --git a/fastlib/src/vespa/fastlib/text/CMakeLists.txt b/fastlib/src/vespa/fastlib/text/CMakeLists.txt
index 2d4af69411f..cfc5b0a6343 100644
--- a/fastlib/src/vespa/fastlib/text/CMakeLists.txt
+++ b/fastlib/src/vespa/fastlib/text/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 vespa_add_library(fastlib_text
     SOURCES
     unicodeutil.cpp
diff --git a/fastlib/src/vespa/fastlib/text/alphasort/AlphaSort1_0.dtd b/fastlib/src/vespa/fastlib/text/alphasort/AlphaSort1_0.dtd
index f9cf4833443..8d1a3afb4fc 100644
--- a/fastlib/src/vespa/fastlib/text/alphasort/AlphaSort1_0.dtd
+++ b/fastlib/src/vespa/fastlib/text/alphasort/AlphaSort1_0.dtd
@@ -1,4 +1,5 @@
 <!--  (c) 2002 Fast Search & Transfer. All rights reserved.  -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
 <!--  Version 1.0 -->
 
 <!ELEMENT sortOrder (sortValue*)>
diff --git a/fastlib/src/vespa/fastlib/text/alphasort/AlphaSortMasterFile.xml b/fastlib/src/vespa/fastlib/text/alphasort/AlphaSortMasterFile.xml
index 5cecb69fe31..4a321e30dbb 100644
--- a/fastlib/src/vespa/fastlib/text/alphasort/AlphaSortMasterFile.xml
+++ b/fastlib/src/vespa/fastlib/text/alphasort/AlphaSortMasterFile.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
 <!DOCTYPE masterFile SYSTEM "SortMaster1_0.dtd">
 <masterFile>
    <sortValueWidth> 8 </sortValueWidth>
diff --git a/fastlib/src/vespa/fastlib/text/alphasort/Arabic.xml b/fastlib/src/vespa/fastlib/text/alphasort/Arabic.xml
index 1d1caca1907..493adab0a49 100644
--- a/fastlib/src/vespa/fastlib/text/alphasort/Arabic.xml
+++ b/fastlib/src/vespa/fastlib/text/alphasort/Arabic.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
 <!DOCTYPE sortOrder SYSTEM "AlphaSort1_0.dtd">
 <sortOrder>  
    <sortValue>
diff --git a/fastlib/src/vespa/fastlib/text/alphasort/Cyrillic.xml b/fastlib/src/vespa/fastlib/text/alphasort/Cyrillic.xml
index d029a5f3ca7..973fdf25cb1 100644
--- a/fastlib/src/vespa/fastlib/text/alphasort/Cyrillic.xml
+++ b/fastlib/src/vespa/fastlib/text/alphasort/Cyrillic.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
 <!DOCTYPE sortOrder SYSTEM "AlphaSort1_0.dtd">
 <sortOrder>  
    <sortValue>
diff --git a/fastlib/src/vespa/fastlib/text/alphasort/Greek.xml b/fastlib/src/vespa/fastlib/text/alphasort/Greek.xml
index 071ab76a4e9..9654db83344 100644
--- a/fastlib/src/vespa/fastlib/text/alphasort/Greek.xml
+++ b/fastlib/src/vespa/fastlib/text/alphasort/Greek.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
 <!DOCTYPE sortOrder SYSTEM "AlphaSort1_0.dtd">
 <sortOrder>  
    <sortValue>
diff --git a/fastlib/src/vespa/fastlib/text/alphasort/Hangul.xml b/fastlib/src/vespa/fastlib/text/alphasort/Hangul.xml
index 5483b53f101..b8ed3bc5ec6 100644
--- a/fastlib/src/vespa/fastlib/text/alphasort/Hangul.xml
+++ b/fastlib/src/vespa/fastlib/text/alphasort/Hangul.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
 <!DOCTYPE sortOrder SYSTEM "AlphaSort1_0.dtd">
 <sortOrder>
    <sortValue>
diff --git a/fastlib/src/vespa/fastlib/text/alphasort/Hanzi-simplified-by-pinyin.xml b/fastlib/src/vespa/fastlib/text/alphasort/Hanzi-simplified-by-pinyin.xml
index e074f1bca06..a6ea4a4aca4 100644
--- a/fastlib/src/vespa/fastlib/text/alphasort/Hanzi-simplified-by-pinyin.xml
+++ b/fastlib/src/vespa/fastlib/text/alphasort/Hanzi-simplified-by-pinyin.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
 <!DOCTYPE sortValue SYSTEM "AlphaSort1_0.dtd">
 <sortOrder> 
 		<sortValue><unicode><utf8>啊</utf8></unicode></sortValue>
diff --git a/fastlib/src/vespa/fastlib/text/alphasort/Hanzi-simplified-by-radical.xml b/fastlib/src/vespa/fastlib/text/alphasort/Hanzi-simplified-by-radical.xml
index 56053186b98..4badfc080d6 100644
--- a/fastlib/src/vespa/fastlib/text/alphasort/Hanzi-simplified-by-radical.xml
+++ b/fastlib/src/vespa/fastlib/text/alphasort/Hanzi-simplified-by-radical.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
 <!DOCTYPE sortValue SYSTEM "AlphaSort1_0.dtd">
 <sortOrder> 
 		<sortValue><unicode><utf8>兙</utf8></unicode></sortValue>
diff --git a/fastlib/src/vespa/fastlib/text/alphasort/Hanzi-traditional-by-pinyin.xml b/fastlib/src/vespa/fastlib/text/alphasort/Hanzi-traditional-by-pinyin.xml
index b93e0a93e08..9e5b35bad94 100644
--- a/fastlib/src/vespa/fastlib/text/alphasort/Hanzi-traditional-by-pinyin.xml
+++ b/fastlib/src/vespa/fastlib/text/alphasort/Hanzi-traditional-by-pinyin.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
 <!DOCTYPE sortValue SYSTEM "AlphaSort1_0.dtd">
 <sortOrder> 
 		<sortValue><unicode><utf8>ㄅ</utf8></unicode></sortValue>
diff --git a/fastlib/src/vespa/fastlib/text/alphasort/Hanzi-traditional-by-radical.xml b/fastlib/src/vespa/fastlib/text/alphasort/Hanzi-traditional-by-radical.xml
index d212412d33f..063f028fa52 100644
--- a/fastlib/src/vespa/fastlib/text/alphasort/Hanzi-traditional-by-radical.xml
+++ b/fastlib/src/vespa/fastlib/text/alphasort/Hanzi-traditional-by-radical.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
 <!-- DOCTYPE sortValue SYSTEM "AlphaSort1_0.dtd" -->
 <sortOrder> 
 		<sortValue><unicode><utf8>兙</utf8></unicode></sortValue>
diff --git a/fastlib/src/vespa/fastlib/text/alphasort/Hanzi-traditional-by-stroke.xml b/fastlib/src/vespa/fastlib/text/alphasort/Hanzi-traditional-by-stroke.xml
index a9b6c7245c1..599212eba07 100644
--- a/fastlib/src/vespa/fastlib/text/alphasort/Hanzi-traditional-by-stroke.xml
+++ b/fastlib/src/vespa/fastlib/text/alphasort/Hanzi-traditional-by-stroke.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
 <!DOCTYPE sortValue SYSTEM "AlphaSort1_0.dtd">
 <sortOrder> 
 		<sortValue><unicode><utf8>一</utf8></unicode></sortValue>
diff --git a/fastlib/src/vespa/fastlib/text/alphasort/Hebrew.xml b/fastlib/src/vespa/fastlib/text/alphasort/Hebrew.xml
index aa33151ab11..913eaed8da0 100644
--- a/fastlib/src/vespa/fastlib/text/alphasort/Hebrew.xml
+++ b/fastlib/src/vespa/fastlib/text/alphasort/Hebrew.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
 <!DOCTYPE sortOrder SYSTEM "AlphaSort1_0.dtd">
 <sortOrder>  
    <sortValue>
diff --git a/fastlib/src/vespa/fastlib/text/alphasort/Kana.xml b/fastlib/src/vespa/fastlib/text/alphasort/Kana.xml
index 1901b2723ce..2be11cc3b1f 100644
--- a/fastlib/src/vespa/fastlib/text/alphasort/Kana.xml
+++ b/fastlib/src/vespa/fastlib/text/alphasort/Kana.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
 <!DOCTYPE sortOrder SYSTEM "AlphaSort1_0.dtd">
 <sortOrder> 
    <sortValue>
diff --git a/fastlib/src/vespa/fastlib/text/alphasort/Kanji-by-radical.xml b/fastlib/src/vespa/fastlib/text/alphasort/Kanji-by-radical.xml
index 283c84712f6..70c1915da15 100644
--- a/fastlib/src/vespa/fastlib/text/alphasort/Kanji-by-radical.xml
+++ b/fastlib/src/vespa/fastlib/text/alphasort/Kanji-by-radical.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
 <!DOCTYPE sortOrder SYSTEM "AlphaSort1_0.dtd">
 
 <-- 
diff --git a/fastlib/src/vespa/fastlib/text/alphasort/Latin.xml b/fastlib/src/vespa/fastlib/text/alphasort/Latin.xml
index 701da424b88..eba9b9ac50c 100644
--- a/fastlib/src/vespa/fastlib/text/alphasort/Latin.xml
+++ b/fastlib/src/vespa/fastlib/text/alphasort/Latin.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
 <!DOCTYPE sortOrder SYSTEM "AlphaSort1_0.dtd">
 <sortOrder>  
    <sortValue>
diff --git a/fastlib/src/vespa/fastlib/text/alphasort/Numbers.xml b/fastlib/src/vespa/fastlib/text/alphasort/Numbers.xml
index d3a312a624c..ced4668d9d7 100644
--- a/fastlib/src/vespa/fastlib/text/alphasort/Numbers.xml
+++ b/fastlib/src/vespa/fastlib/text/alphasort/Numbers.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
 <!DOCTYPE sortOrder SYSTEM "AlphaSort1_0.dtd">
 <sortOrder>  
    <sortValue>
diff --git a/fastlib/src/vespa/fastlib/text/alphasort/SortMaster1_0.dtd b/fastlib/src/vespa/fastlib/text/alphasort/SortMaster1_0.dtd
index 7607a341a06..e85a8c705ea 100644
--- a/fastlib/src/vespa/fastlib/text/alphasort/SortMaster1_0.dtd
+++ b/fastlib/src/vespa/fastlib/text/alphasort/SortMaster1_0.dtd
@@ -1,4 +1,5 @@
 <!--  (c) 2002 Fast Search & Transfer. All rights reserved.  -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
 <!--  Version 1.0 -->
 
 <!ELEMENT masterFile (sortValueWidth, importFiles)>
diff --git a/fastlib/src/vespa/fastlib/text/alphasort/Space.xml b/fastlib/src/vespa/fastlib/text/alphasort/Space.xml
index 1317489ae8a..8e0c33e7b8f 100644
--- a/fastlib/src/vespa/fastlib/text/alphasort/Space.xml
+++ b/fastlib/src/vespa/fastlib/text/alphasort/Space.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
 <!DOCTYPE sortOrder SYSTEM "AlphaSort1_0.dtd">
 <sortOrder>  
    <sortValue>
diff --git a/fastlib/src/vespa/fastlib/text/apps/CMakeLists.txt b/fastlib/src/vespa/fastlib/text/apps/CMakeLists.txt
index 727a58a7b91..2258f1373a6 100644
--- a/fastlib/src/vespa/fastlib/text/apps/CMakeLists.txt
+++ b/fastlib/src/vespa/fastlib/text/apps/CMakeLists.txt
@@ -1,2 +1,2 @@
-# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 # Ignored since these apps don't compile
diff --git a/fastlib/src/vespa/fastlib/text/apps/extcase.cpp b/fastlib/src/vespa/fastlib/text/apps/extcase.cpp
index 5f7579287e0..5e5f3a04492 100644
--- a/fastlib/src/vespa/fastlib/text/apps/extcase.cpp
+++ b/fastlib/src/vespa/fastlib/text/apps/extcase.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 /**
  * @author Tor Egge
  * @author Vidar Larsen
diff --git a/fastlib/src/vespa/fastlib/text/apps/unicode_propertydump.cpp b/fastlib/src/vespa/fastlib/text/apps/unicode_propertydump.cpp
index 8a1260a5355..891edfabbff 100644
--- a/fastlib/src/vespa/fastlib/text/apps/unicode_propertydump.cpp
+++ b/fastlib/src/vespa/fastlib/text/apps/unicode_propertydump.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include <vespa/fastlib/text/unicodeutil.h>
 #include <vespa/fastos/app.h>
diff --git a/fastlib/src/vespa/fastlib/text/apps/unicode_tolowerdump.cpp b/fastlib/src/vespa/fastlib/text/apps/unicode_tolowerdump.cpp
index b000645295a..21d11390df4 100644
--- a/fastlib/src/vespa/fastlib/text/apps/unicode_tolowerdump.cpp
+++ b/fastlib/src/vespa/fastlib/text/apps/unicode_tolowerdump.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include <vespa/fastlib/text/unicodeutil.h>
 #include <vespa/fastos/app.h>
diff --git a/fastlib/src/vespa/fastlib/text/latintokenizer.h b/fastlib/src/vespa/fastlib/text/latintokenizer.h
index 6053f61802c..2f36886d6be 100644
--- a/fastlib/src/vespa/fastlib/text/latintokenizer.h
+++ b/fastlib/src/vespa/fastlib/text/latintokenizer.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 /**
 *****************************************************************************
 * @author Bård Kvalheim
diff --git a/fastlib/src/vespa/fastlib/text/normwordfolder.cpp b/fastlib/src/vespa/fastlib/text/normwordfolder.cpp
index 93debb0a0e2..208bf9c8cb1 100644
--- a/fastlib/src/vespa/fastlib/text/normwordfolder.cpp
+++ b/fastlib/src/vespa/fastlib/text/normwordfolder.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include <vespa/fastlib/text/unicodeutil.h>
 #include <vespa/fastlib/text/normwordfolder.h>
diff --git a/fastlib/src/vespa/fastlib/text/normwordfolder.h b/fastlib/src/vespa/fastlib/text/normwordfolder.h
index 65163c851af..d8f8f1ed047 100644
--- a/fastlib/src/vespa/fastlib/text/normwordfolder.h
+++ b/fastlib/src/vespa/fastlib/text/normwordfolder.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #pragma once
 
diff --git a/fastlib/src/vespa/fastlib/text/tests/CMakeLists.txt b/fastlib/src/vespa/fastlib/text/tests/CMakeLists.txt
index 125c6a1b036..d5650edd1d5 100644
--- a/fastlib/src/vespa/fastlib/text/tests/CMakeLists.txt
+++ b/fastlib/src/vespa/fastlib/text/tests/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 vespa_add_executable(fastlib_unicodeutiltest_app TEST
     SOURCES
     unicodeutiltest.cpp
diff --git a/fastlib/src/vespa/fastlib/text/tests/characterclasstest.cpp b/fastlib/src/vespa/fastlib/text/tests/characterclasstest.cpp
index e216e5034d6..e0d5b429177 100644
--- a/fastlib/src/vespa/fastlib/text/tests/characterclasstest.cpp
+++ b/fastlib/src/vespa/fastlib/text/tests/characterclasstest.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #include "characterclasstest.h"
 
 int character_class_test_app::Main()
diff --git a/fastlib/src/vespa/fastlib/text/tests/latintokenizertest.cpp b/fastlib/src/vespa/fastlib/text/tests/latintokenizertest.cpp
index 69c0384afe5..ce7c72e1922 100644
--- a/fastlib/src/vespa/fastlib/text/tests/latintokenizertest.cpp
+++ b/fastlib/src/vespa/fastlib/text/tests/latintokenizertest.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #include "latintokenizertest.h"
 
 int LatinTokenizerTestApp::Main()
diff --git a/fastlib/src/vespa/fastlib/text/tests/latintokenizertest.h b/fastlib/src/vespa/fastlib/text/tests/latintokenizertest.h
index 4115e3f7a05..1b2c7d1ed8f 100644
--- a/fastlib/src/vespa/fastlib/text/tests/latintokenizertest.h
+++ b/fastlib/src/vespa/fastlib/text/tests/latintokenizertest.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #pragma once
 
 #include <vespa/fastlib/testsuite/test.h>
diff --git a/fastlib/src/vespa/fastlib/text/tests/unicodeutiltest.cpp b/fastlib/src/vespa/fastlib/text/tests/unicodeutiltest.cpp
index 6f66bd2ace6..98a3831f39d 100644
--- a/fastlib/src/vespa/fastlib/text/tests/unicodeutiltest.cpp
+++ b/fastlib/src/vespa/fastlib/text/tests/unicodeutiltest.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #include "unicodeutiltest.h"
 
 int UnicodeUtilTestApp::Main()
diff --git a/fastlib/src/vespa/fastlib/text/tests/unicodeutiltest.h b/fastlib/src/vespa/fastlib/text/tests/unicodeutiltest.h
index aaebe145958..dde37cdb4a6 100644
--- a/fastlib/src/vespa/fastlib/text/tests/unicodeutiltest.h
+++ b/fastlib/src/vespa/fastlib/text/tests/unicodeutiltest.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #include <vespa/fastlib/testsuite/test.h>
 #include <vespa/fastlib/text/unicodeutil.h>
 #include <vespa/fastos/app.h>
diff --git a/fastlib/src/vespa/fastlib/text/tests/wordfolderstest.cpp b/fastlib/src/vespa/fastlib/text/tests/wordfolderstest.cpp
index 003f4ee7c5b..bfb792d6e80 100644
--- a/fastlib/src/vespa/fastlib/text/tests/wordfolderstest.cpp
+++ b/fastlib/src/vespa/fastlib/text/tests/wordfolderstest.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #include "wordfolderstest.h"
 
 int WordFoldersTestApp::Main()
diff --git a/fastlib/src/vespa/fastlib/text/tests/wordfolderstest.h b/fastlib/src/vespa/fastlib/text/tests/wordfolderstest.h
index 08b3e60a538..eec9b2aec11 100644
--- a/fastlib/src/vespa/fastlib/text/tests/wordfolderstest.h
+++ b/fastlib/src/vespa/fastlib/text/tests/wordfolderstest.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #include <vespa/fastlib/testsuite/test.h>
 #include <vespa/fastlib/text/normwordfolder.h>
 #include <vespa/fastos/app.h>
diff --git a/fastlib/src/vespa/fastlib/text/unicodeutil-charprops.cpp b/fastlib/src/vespa/fastlib/text/unicodeutil-charprops.cpp
index ce458d8fa28..8aa8c6d5b19 100644
--- a/fastlib/src/vespa/fastlib/text/unicodeutil-charprops.cpp
+++ b/fastlib/src/vespa/fastlib/text/unicodeutil-charprops.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 /*
  * This file is auto-generated by extprop.cpp
  *
diff --git a/fastlib/src/vespa/fastlib/text/unicodeutil-lowercase.cpp b/fastlib/src/vespa/fastlib/text/unicodeutil-lowercase.cpp
index c1230a2fb56..ae2bb4bcda1 100644
--- a/fastlib/src/vespa/fastlib/text/unicodeutil-lowercase.cpp
+++ b/fastlib/src/vespa/fastlib/text/unicodeutil-lowercase.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 /*
  * This file is auto-generated by extcase.cpp
  */
diff --git a/fastlib/src/vespa/fastlib/text/unicodeutil.cpp b/fastlib/src/vespa/fastlib/text/unicodeutil.cpp
index c0c88a61728..03ed25d30b7 100644
--- a/fastlib/src/vespa/fastlib/text/unicodeutil.cpp
+++ b/fastlib/src/vespa/fastlib/text/unicodeutil.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "unicodeutil.h"
 #include <cstdlib>
diff --git a/fastlib/src/vespa/fastlib/text/unicodeutil.h b/fastlib/src/vespa/fastlib/text/unicodeutil.h
index 1bb638270fa..5606df4199d 100644
--- a/fastlib/src/vespa/fastlib/text/unicodeutil.h
+++ b/fastlib/src/vespa/fastlib/text/unicodeutil.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 /**
  * Unicode utilities.
  */
diff --git a/fastlib/src/vespa/fastlib/text/wordfolder.cpp b/fastlib/src/vespa/fastlib/text/wordfolder.cpp
index 221960e046c..52b84658ec3 100644
--- a/fastlib/src/vespa/fastlib/text/wordfolder.cpp
+++ b/fastlib/src/vespa/fastlib/text/wordfolder.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "wordfolder.h"
 
diff --git a/fastlib/src/vespa/fastlib/text/wordfolder.h b/fastlib/src/vespa/fastlib/text/wordfolder.h
index 969ae0cd7ea..d567b9e7c26 100644
--- a/fastlib/src/vespa/fastlib/text/wordfolder.h
+++ b/fastlib/src/vespa/fastlib/text/wordfolder.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #pragma once
 
 #include <vespa/fastlib/text/unicodeutil.h>
diff --git a/fastlib/src/vespa/fastlib/util/CMakeLists.txt b/fastlib/src/vespa/fastlib/util/CMakeLists.txt
index efe283f4f6c..28a4f8b3c0e 100644
--- a/fastlib/src/vespa/fastlib/util/CMakeLists.txt
+++ b/fastlib/src/vespa/fastlib/util/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 vespa_add_library(fastlib_util
     SOURCES
     base64.cpp
diff --git a/fastlib/src/vespa/fastlib/util/bag.h b/fastlib/src/vespa/fastlib/util/bag.h
index c703e10e395..816208fe440 100644
--- a/fastlib/src/vespa/fastlib/util/bag.h
+++ b/fastlib/src/vespa/fastlib/util/bag.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 //**************************************************************************
 /**
  * @author Bård Kvalheim
diff --git a/fastlib/src/vespa/fastlib/util/base64.cpp b/fastlib/src/vespa/fastlib/util/base64.cpp
index 7cd9b35edac..279da94b2fa 100644
--- a/fastlib/src/vespa/fastlib/util/base64.cpp
+++ b/fastlib/src/vespa/fastlib/util/base64.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 /**
 *****************************************************************************
 * @author Aleksander Øhrn
diff --git a/fastlib/src/vespa/fastlib/util/base64.h b/fastlib/src/vespa/fastlib/util/base64.h
index 9577fbf0b93..4a1cb873e7b 100644
--- a/fastlib/src/vespa/fastlib/util/base64.h
+++ b/fastlib/src/vespa/fastlib/util/base64.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 /**
 *****************************************************************************
 * @author Aleksander Øhrn
diff --git a/fastlib/src/vespa/fastlib/util/testproject.el b/fastlib/src/vespa/fastlib/util/testproject.el
index e0e2775d6ec..0c0546614f3 100644
--- a/fastlib/src/vespa/fastlib/util/testproject.el
+++ b/fastlib/src/vespa/fastlib/util/testproject.el
@@ -1,3 +1,4 @@
+;; Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 ;; testproject.el
 
 ;;  Local configurations for the cpptest Emacs unit-test framework
diff --git a/fastlib/src/vespa/fastlib/util/tests/CMakeLists.txt b/fastlib/src/vespa/fastlib/util/tests/CMakeLists.txt
index 83c6a53984a..3ba1ff161cd 100644
--- a/fastlib/src/vespa/fastlib/util/tests/CMakeLists.txt
+++ b/fastlib/src/vespa/fastlib/util/tests/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 vespa_add_executable(fastlib_base64test_app TEST
     SOURCES
     base64test.cpp
diff --git a/fastlib/src/vespa/fastlib/util/tests/bagtest.cpp b/fastlib/src/vespa/fastlib/util/tests/bagtest.cpp
index a547ac98507..cb5e8f468b6 100644
--- a/fastlib/src/vespa/fastlib/util/tests/bagtest.cpp
+++ b/fastlib/src/vespa/fastlib/util/tests/bagtest.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #include "bagtest.h"
 
 
diff --git a/fastlib/src/vespa/fastlib/util/tests/bagtest.h b/fastlib/src/vespa/fastlib/util/tests/bagtest.h
index daf0c2d507a..4aec082948e 100644
--- a/fastlib/src/vespa/fastlib/util/tests/bagtest.h
+++ b/fastlib/src/vespa/fastlib/util/tests/bagtest.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include <vespa/fastlib/util/bag.h>
 #include <vespa/fastlib/testsuite/test.h>
diff --git a/fastlib/src/vespa/fastlib/util/tests/base64test.cpp b/fastlib/src/vespa/fastlib/util/tests/base64test.cpp
index 531f22a6e27..accf7fc87b3 100644
--- a/fastlib/src/vespa/fastlib/util/tests/base64test.cpp
+++ b/fastlib/src/vespa/fastlib/util/tests/base64test.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #include <vespa/fastos/app.h>
 #include <vespa/fastos/file.h>
 #include <vespa/vespalib/stllike/string.h>
diff --git a/fastlib/src/vespa/fastlib/util/tests/wildcard_match_test.cpp b/fastlib/src/vespa/fastlib/util/tests/wildcard_match_test.cpp
index 7121a9c83af..e27ef72b978 100644
--- a/fastlib/src/vespa/fastlib/util/tests/wildcard_match_test.cpp
+++ b/fastlib/src/vespa/fastlib/util/tests/wildcard_match_test.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #include <iostream>
 #include "../wildcard_match.h"
 
diff --git a/fastlib/src/vespa/fastlib/util/wildcard_match.h b/fastlib/src/vespa/fastlib/util/wildcard_match.h
index 03b006610f7..ab0f369e052 100644
--- a/fastlib/src/vespa/fastlib/util/wildcard_match.h
+++ b/fastlib/src/vespa/fastlib/util/wildcard_match.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #pragma once
 
 namespace fast
diff --git a/fastlib/src/vespa/packages/CMakeLists.txt b/fastlib/src/vespa/packages/CMakeLists.txt
index 35c7b4ec191..aff77cf556c 100644
--- a/fastlib/src/vespa/packages/CMakeLists.txt
+++ b/fastlib/src/vespa/packages/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 vespa_add_library(fastlib_fast
     SOURCES
     $<TARGET_OBJECTS:fastlib_net>