Merge "Adding censored property"

Change-Id: Iab5311977d5e22dd147ecb3290b8582aaa7a34f7
survivors cleanup 1

Change-Id: Ie6c1896ecc9f07fbf1a409f0d68b910e5dca5449
Merge branch 'master' of ssh://gerrit.wikimedia.org:29418/analytics/wikimetrics

Change-Id: I8b62bdb2b927d85f81ff290b29b943ebe5c16b6e