use standard base64 encoder as url-safe encoder has issues with python base64
Merge branch 'testing' of git.eucalyptus-systems.com:eucalyptus into testing