Use new CSR dialog for creation of CSRs
(cherry picked from commit 9590d0cbca5288705eae2a1acc2785df5e251e45)