EUCA-4544: restored 1006.xml (out of db connections)
Merge remote-tracking branch 'remotes/origin/dev/ethomas/EUCA-4544' into maint/3.2/testing