Merge "Add missing copyright/license header" into stable-2.16