Bug 1324365: Fixed messages
Merge branch 'jio_dashboard' of https://github.com/JioCloud/horizon into jio_dashboard