DS-1735 fix. Merge old 'librarian-puppet-bootstrap.sh' into 'puppet-bootstrap-ubuntu.sh. Also swith to using 'librarian-puppet-maestrov'.
Enhance apt-spy-2-bootstrap to install its dependencies if missing. Also do basic verification of IP address and Country code.
Add a default 'puppet.conf' to configure Puppet to *also* look in /vagrant/modules for Puppet modules
Update Vagrantfile based on previous 3 commits. Part of fix for DS-1735.  Also two minor enhancements: Set the system locale to UTF-8 and turn off system beep.