Per wikitech-l consensus: https://lists.wikimedia.org/pipermail/wikitech-l/2016-February/084821.html Change-Id: I1d2604e3f246ede58ff8245ba2b940f258d2d80c
... and remove some actual copy-paste mistakes. Change-Id: Id2fd83edff774a7f07b0f5436cefe2bf5c0a63f0