Merge branch 'release/v2.5.4' into develop
fix admin display of subscriber - contact dropdown too long
update version v2.5.5
Merge branch 'release/v2.5.5'