Merge "Add ability to skip disk_config tests regardless of extension status"