merge bugfix for cache locking + makepom changes; use makepom changes + package crypto in build-release.xml