JCR-2355: Changes reverted and test disabled