This allows to maintain the default behavior unchanged while making it possible to force clean. Follow-up to https://review.openstack.org/#/c/145921/ Change-Id: Ie5733b22bda9cdd7d08f5c5ecc5a3d94b984a125
-h