(PUP-1118) Load full environments from a directory

This changes the loader used by the code to list environments to be a
composition of the legacy environments and the new directory
environments.