Icehouse branch version updates

Change-Id: I50edee8f2e681965febe0657dde62637ce94d1de