feature #2500: option to encode credentials in sunstone
Merge branch 'feature-2500'