Merge "Revert "Add new test "RebuildInstanceWithVolume"""