EUCA-9540 removing EntityWrapper references from classes in package com.eucalyptus.blockstorage, also added unit tests
Merge branch 'testing' into dev/wwannemacher/EUCA-9540-2