[CHEF-955] Refactored remote url update conditions