Icehouse branch version updates

Change-Id: Iaf270be054d420d7c3781d3a4d02a398e5b3dfc1