Merge branch 'password-ampersand-validation'

Fixes AIRAVATA-2715