Use OPM icehouse

Appropriate OPM branch should be used instead of master

Change-Id: I113984a468518161617b120a5289ef04ae00be25