EUCA-7298,
back-ported timer cleanup code for user session
Merge branch 'maint/3.3/testing' of git.eucalyptus-systems.com:eucalyptus into maint/3.3/testing