GPII-91: added a crazy merge policy to make the lifecycle resolve work again. Updated to the latest express.

Signed-off-by: Yura Zenevich <yura.zenevich@gmail.com>
Merge branch 'GPII-91' into GPII-76
NOJIRA: Removed git ignore.
Merge branch 'GPII-91' into GPII-76