MDL-51582 grunt: task improvements