Merge "Change the way how curator remove indices"