Comment 6 for bug 1800871

I took the opportunity to rebase, sign off on Josh's commit, and add a follow-up commit to change the upgrade script to an UPDATE rather than INSERT statement: user/sandbergja/lp1800871_MADS_2.15_update