Resource tagging fix for database connection leak - EUCA-5456

Ensure lazy loading of resource entity occurs within a transaction.

EUCA-5456
Merge remote-tracking branch 'origin/dev/sjones/EUCA-5456' into testing