Icehouse branch version updates

Change-Id: I129d1986812940ecf09f1711ed8795039129421c