Merge "Add test extservices apex config for e2e tests"