Do not halt compile_defs on external and local mapping mismatch
Merge branch 'master' of github.com:libris/librisxl