EUCA-8494 add account_id field to resources
Merge branch 'dev/ethomas/EUCA-8494' into testing