Merge "Hostside test for setting organization name" into nyc-dev