[RICPLT-2584,2789] Code fixes + tests for E2T instance shutdown flow