auto cluster cleanup startup

Merged Christian Hitz requested to merge chhitz/dss-mainline:12265-auto-cluster-cleanup-startup into master Feb 18, 2016