Fixes #6544 - creates the qpidd_group param & updates filenames for amqp trustore and
keystores