Refs #9561; Code cleanup, fixed some issues when saving modified provenance info