Merge 4.5 to master

some conflicts in messages*.properties file from the commit https://github.com/apache/cloudstack/commit/303fc90057db2707ae8f6b709fb5e3e86fc9db40 
resolved in favour of master
CC: @milamberspace