merged in apigee specific config changes.