Merge pull request #520 from coheigea/AMQ-7457

AMQ-7457 - Support wider password encryption schemes