Merge pull request #11685 from colemanw/4-7-28-up
authorEileen McNaughton <eileen@mcnaughty.com>
Sun, 18 Feb 2018 21:07:29 +0000 (10:07 +1300)
committerGitHub <noreply@github.com>
Sun, 18 Feb 2018 21:07:29 +0000 (10:07 +1300)
Ignore errors when upgrade step already took place


Trivial merge