Merge pull request #2555 from mozilla/ubuntu-16.04

Remove ubuntu-advantage-tools package to workaround ESM repository 401 problem

taskcluster/docker-build-base.tyml

@@ -37,6 +37,7 @@ then:
       - $let:
           dockerfile: { $eval: strip(str(build.dockerfile)) }
         in: >
+          apt-get -qq -y remove --purge ubuntu-advantage-tools &&
           ${aptEc2Mirrors} &&
           apt-get -qq update && apt-get -qq -y install git wget pkg-config apt-transport-https ca-certificates curl software-properties-common &&
           curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - &&

taskcluster/linux-opt-base.tyml

@@ -47,6 +47,7 @@ then:
           extraSystemSetup: { $eval: strip(str(build.system_setup)) }
           extraSystemConfig: { $eval: strip(str(build.system_config)) }
         in: >
+          apt-get -qq -y remove --purge ubuntu-advantage-tools &&
           ${aptEc2Mirrors} &&
           apt-get -qq update && apt-get -qq -y install git pixz wget pkg-config libsox-dev && ${extraSystemSetup} &&
           adduser --system --home ${system.homedir.linux} ${system.username} &&