Merge "Mark DVR/HA migration tests unstable"