Merge "Regenerate counterId when a new cert XML file is successfully imported" into pi-dev