Merge "Euphrates cleaning: remove any reference to aaa vnf"