EUCA-8810, added more graceful shutdown to Quartz tasks
Merge branch 'testing' into dev/wwannemacher/EUCA-8810
Merge branch 'testing' into dev/wwannemacher/EUCA-8810