Fix for re-registration based on latest fix
Merge branch 'master' of github.com:eucalyptus/eucalyptus-cookbook