Javacallout changes to remove com.apigee format, and Handle CORS implementation