Feature #1631: Add a new ACTION filed to each History
Feature #1631: Use enum type in RM one.vm.action
Feature #1631: Change history reasons to be only 3: none, user, error
Merge remote-tracking branch 'origin/one-4.0' into feature-1631

Conflicts:
	src/rm/RequestManagerVirtualMachine.cc
Feature #1631: Fix merge
Feature #1631: Set USER reason for any operation initiated by the user
Add new undeploy action to Sunstone
Feature #1631: Fix history reason for migrate.
Fix login error message
bug #1862: Fix model field in vm template creation form
Feature #1631: Add history close action to onevm show and oneacct output
feature #1859: start/stop/restart actions for scheduler
Feature #1631: Add migrator to 4.0.0
Feature #1631: Add new action element to xsd files
Feature #1631: Rearrange History Actions so NONE is 0
Feature #1631: Fix change made for testing
Feature #1797: The action to wake up a poweroff VM is now 'resume'
onevm show now lists the hostname for vms in poweroff
feature #1643: add IPv6 support to RPM context packages
Feature #1839: Add new state BOOT_UNDEPLOY to handle a deploy failure from UNDEPLOYED