Add support for upgrading through icehouse

Change-Id: I27f9612cbc008730ef272bab707065f670785293