Icehouse branch version updates

Change-Id: I9502929cfc9c9a61117939cf39e874a608463951