625 - Added Already in list mesage on subscription message
Merge with development
Merge with dev/j2/common
Merge branch 'dev/j2/common' into dev/j2/free