Icehouse branch version updates

Change-Id: Iab2f90e10a7115cc69ab129de2da734711d4a72e