Updated from global requirements

Change-Id: I71c6d9e38c605e0763287de143bbffcb2d90d4f6
Merge remote-tracking branch 'upstream/stable/icehouse' into stable/icehouse