Split up the volume manager into two.  One part is for self-service.  One part belongs in the engine.  Removed old 2.1 upgrade code.  In order to upgrade from 2.1, you must upgrade to 2.2. first.  So therefore these files are no necessary in the newer versions of CloudStack
Added missing file
Moved volume related code into cloud-engine-orchestration
Resolved merge conflicts
Fixed the applicationcontext.xml