GPII-3888:  Merged latest changes from upstream GPII master branch
GPII-3888:  Merged latest changes from upstream GPII master branch

Now using universal tag technique for referencing docker images.

mrtyler/gpii-terraform,mrtyler/gpii-infra,mrtyler/gpii-infra,mrtyler/gpii-infra,mrtyler/gpii-terraform,mrtyler/gpii-terraform,mrtyler/gpii-infra