Bug 908557 - Remove the affiliated option
Merge pull request #11851 from crh0716/908557

Bug 908557 - Remove the affiliated option r=evelyn