Merge "Bug 1861 - Adding the missing moxy related bundles to the NSF feature that...