Add services up test at the end of upgrade
Merge remote-tracking branch 'origin/testing' into testing