EUCA-7660 Account for new eustore naming convention
Merge pull request #2 from mspaulding06/EUCA-7660

EUCA-7660 Account for new eustore naming convention
Merge remote-tracking branch 'upstream/master' into EUCA-7706