Merge "Wait for VM ACTIVE state is added for fixed network case"