Merge "fix vserver deletion in AAI"