CLOUDIFY-1703 Added handling for remove non-existing attributes