[oe] cmake in stable

[Maksym Parkachov]

Hi everyone,

could someone, please, cherry-pick following commits to the
2011.03-maintenance branch as the cmake is broken in this branch.

7ce3543709765f37e359b2fa449216c834a5910e
37a042ec115f100a0aef606ee7f88cad560f0d1e

Thanks in advance,
Maksym.