Removed Tasks, add Workarounds, minor wrkarounds for icehouse added

Change-Id: I395d782001b885a2e1100a1afe074f897ce3d6a2