Merge simulator from ECOMP's repository

No match.