Merge "Updates CloudEdgeDeploymentScenario to use BaSyxAASServerConfiguration"