...whereby some branding could be orverridden with information from a program/edition/
directory.

Change-Id: I7f9324678b09bc8069775dfcbda97be8e0618a91