CLOUDSTACK-5696: Fix sync issue with out-of-band changes