Fixed a problem of compatibility with Amazon EC2 in the Galera Ganglia monitoring section
Merge branch 'dev' of https://github.com/ConPaaS-team/conpaas into dev