Merge "Modules: add wait_for_machine_status function"