Update CONTRIBUTING and contributor-settings.xml changes to sync with EAP