Merge "changing simulator and endpoints for change management testing"