Merge "Print job files and print job records not always cleaned up." into klp-dev