Icehouse branch version updates

Change-Id: Ib13632761a936f1946bda8b1769d195fbc114f10