EUCA-7172

Remove the behaivor of dividing by 60 or multiplying by 60 when the
timeunit is switched by the user.
Merge branch 'maint/3.3/testing' of git.eucalyptus-systems.com:eucalyptus into maint/3.3/testing