Merge "Update webapp status json to support tenants" into feature/zuulv3