S31817: updates to use vapp level alarm if present. updates to test cluster map to allow richer VM data