Merge branch 'channel-descriptions'
Bug fixes

- code tidy (ArticlePromotionRedemptionResponseMaker)
- article promotions now respect is_active
- ArticlePromotions code tidy
- UserRepository now corruptly checks for no user returned for
invalid/unknown accessKey
Merge branch 'bug-fixes' into dev