CDB-622 #fixes badge in free and dedicated accounts
Merge remote-tracking branch 'origin/hotfix/CDB-622' into release/2.2.1