Removed EntityWrapper.java.
Cleaned up commented references to EntityWrapper in Storage Controller

Implements EUCA-8101