Icehouse branch version updates

Change-Id: Id9011868728d2e412086439f4f75650b0944a1f5