Merge changes from topic "wait-for-staged-session"

* changes:
  Replace logic that waits for staged sessions to get ready in tests
  Abandon active staged sessions before running tests