Upgraded mapfish version to 2.1 and made it work with latest version of flying saucer