Only set local-cluster-name if using chef server
Merge branch 'master' of github.com:eucalyptus/eucalyptus-cookbook