Revert "Revert "Update Quartz to 2.2""

This reverts commit 755efc57e88b65896cca67a9a75f05fe56d10a50.