Bug 552169: Fix problem of p2 sites

  add feature branding

Change-Id: I2f31093b1315a3b64aa0e59420875986d2c99ff2
7 files changed