Merge pull request #3083 from sbutcher-arm/output_env-enhancements-2.16

Backport 2.16: Enhance the `output_env.sh` script with GBD and Distro version