refs #7249 upgrade script
refs #7249 bug fixes