Upgrade to use JCR 1.16.1-GA