[ET Trac] [Einstein Toolkit] #1627: Merge rewrite branch of McLachlan