Merge "Pass url to the AIA supervisor" into nyc-mr1-dev