Merge m-c -> cedar, overwriting cedar-specific changes
Bug 945222 - web-platform-tests integration into Mozilla tree.