Environment template guide enhancement

Added two notices, correct renaming to mapping.

Change-Id: I925cd27058f87539250970b022885d2eaddb4b63
Merge "Environment template guide enhancement"