Conflict resolution: - features.macro: kept fixCleanup3_4_0 from develop and kept SmartEscrow at Supported::Yes, which is the only thing this branch changes.
TMLedgerNode