CLOUDSTACK-5696: fix a regression caused by out-of-band sync changes