A lot of Chris's code

Fixes optimistic lock exception in the launch instance path
Allow update of vm type definitions EUCA-3500
- Add the service operation
- Support update of vm type definition
- Support reset of vm type definition
- Fixup the client tool
- Report the previous definition of the instance type
- Perform upgrade from old VmTypes to new
Merge branch 'testing' of git.eucalyptus-systems.com:eucalyptus into testing