Merge pull request #41 from adityasharma7/ROL-2150-roller-6.0.x

Improve alert messages (ROL-2154)