Merge change 7519

* changes:
  cleanstep for removing the asf config file