Merge "Use system properties to log rollback events"