OS-263: Icehouse support.

Minor changes to work with icehouse.

Change-Id: Id873274ea41439f604c9899097173c6088b85331