CB-5183 WP7/8 lib path is not correctly resolved by CLI (additional changes)
fix conflict with removed head code