Storage controller - replaced EntityWrapper with Entities and Transactions

Implements EUCA-9540