Merge john's autosupport updates