CAL-860 Upgrade to use JCR 1.16.0-Alpha4