Icehouse branch version updates

Change-Id: I3b2dc35b632a5936ae4ce1e5274c1d1e40dc50cf