Merge "Move json files when only uninstalling rpm." into devel/master