Beanstream: Add additional Legato and vault support

See first comment for details.