Merge changes Ic3741f89,I21472a39

* changes:
  add utilities for artifact cleanup
  systest makefile fixes