Upgrade Snappymail to 2.21 and merge the webmail containers