Icehouse ubuntu horizon plugin support on mainline

Change-Id: I186edcd2b7b4b2668338d9b08400aab9c7791522
Merge "Icehouse ubuntu horizon plugin support on mainline"