Merge "Rather than upsert module store, explicitly remove old value and then add...
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 14 Nov 2013 00:16:52 +0000 (00:16 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 14 Nov 2013 00:16:52 +0000 (00:16 +0000)

Trivial merge