Icehouse branch version updates

Change-Id: I2a70ac3e864abbfe2dc0a5abfad65af35b33892b