fixed "Akamai Media Analytics" label
Merge remote-tracking branch 'origin/2.21-Nov-16' into 2.21-Nov-16