[ET Trac] #2485: include complex and real scalar evolution code from Canuda in ET