Fix Strainerfile

Change-Id: I7481c3fa67fc9a93704eb1104f4c375a54bdbcec
Implements: blueprint per-repo-tests
Add missing AMQP options to heat.conf

Add more AMQP and QPID configuration options
to the heat configuration file. This enables
users to use QPID federation support and also
use durable queues for rabbitmq or QPID.

Change-Id: I4b944a3cbf7830d47b1398eeb347946098ce2452