1. test_os_upgrade is moved under test_os_upgrade
2. main code is moved to separate place for excluding copy-paste
in new tests.
3. Fixed logging due to unreadable output
4. Switch to check_call -> remove pain of cherry-picking
5. Use octane-cleanup
Closes-bug: #1612236
Change-Id: Ida7f5901f070a9ef507ce6027fd2618b8617d89f