Merge "[VCN21] Do not add NOT_VCN_MANAGED capability if specifier is present"