GitLab

Temporary hack until the archive package is updated. I
cherry picked commits from master e7b75d9b46fcfea149bf7fd1f53d40379e3c7b5d on
to spl-0.6.5-release, then rsync'd the whole thing.
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>