Fix building issues for Debian and Ubuntu
Merge branch 'master' of git.opennebula.org:one