Added fuel-5.0 (icehouse) support

Change-Id: Ie721561ebe116586d0582fbf1ccb75f264e6ed2f