Icehouse branch version updates

Change-Id: I0f915e2ee8e964a136f62e699723c3e63b74f8b8