JBIDE-18394: Update to Luna SR1