Don't change eucalyptus config file while running euca_conf unless you need to
Merge branch 'testing' of git.eucalyptus-systems.com:eucalyptus into testing