Prevents empty disqus shortname
Merge CDB-2563 into release/2.12.0