ENGINE-1353, add nice message on bad token merging
fix shade of bonita-server.xml