Fix reported issue as part of 3bbc84a
Merge branch 'development' of https://github.com/theforeman/foreman-xen into development
new version
Merge branch 'master' of https://github.com/theforeman/foreman-xen

Conflicts:
	lib/foreman_xen/version.rb