Some small cleanups
Change-Id: I96a6c02ace5babc49a066e70f222f55d51bab6b3
diff --git a/netconf/security/client_credentials/client_keys b/netconf/security/client_credentials/client_keys
index c2d9c96..ceff017 100644
--- a/netconf/security/client_credentials/client_keys
+++ b/netconf/security/client_credentials/client_keys
@@ -1,3 +1,3 @@
-vagrant:id_rsa
-voltha:id_rsa
-user:id_rsa
\ No newline at end of file
+vagrant:id_rsa.pub
+voltha:id_rsa.pub
+user:id_rsa.pub
\ No newline at end of file
diff --git a/netconf/security/client_credentials/id_rsa b/netconf/security/client_credentials/id_rsa
index 935df1f..a1260c9 100644
--- a/netconf/security/client_credentials/id_rsa
+++ b/netconf/security/client_credentials/id_rsa
@@ -1,27 +1,27 @@
-----BEGIN RSA PRIVATE KEY-----
-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
+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
-----END RSA PRIVATE KEY-----
diff --git a/netconf/security/client_credentials/id_rsa.pub b/netconf/security/client_credentials/id_rsa.pub
index ef0da9f..e744803 100644
--- a/netconf/security/client_credentials/id_rsa.pub
+++ b/netconf/security/client_credentials/id_rsa.pub
@@ -1 +1 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDBzi+HBwhSv6886UDR7nZB6kVxOJ5i3WWWfXuo61DyXD8WDh7tQSjeG4IllZkpDj20DmcKsZ4Kms8c2pl4ttsvyoEz0lsKeP9xnRne85cRehgkbAw+SUASner1a3mM3RovvUE+NMMWvlyEtMLnYxa3GV8nBiwXmwqcu9FBpsNNPsF92+M+BgFzBntzlunTTB1zjEBkt3ucwJYVp07XSn4QZ+DcO+omSCgD1Y3m7vActmUbfxoCLVyWzxSuyLBaJ7rYJw4AQ9ma+jUYQBvz4rToOxboDUMGUy/zQMJ5u8GDxctgmH/bZ4CJXE1wlakR5ynouSoPhX/iuB841K4543sP vagrant@voltha
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC0Ix05mz647U81wNYl2uPPm0+Waoemr1QK/RxGuizXgC+mcxH924aVuQl61hf9cX+P6BYk8zN9tNdO+QHwbdxf7qjJHXzILdq3slAihNHuiYo+W++sDgeLErfFTyFOCbJVcuneF6ow7pFvF/UzwDijTa+par0S7fTZ2RkO+No17itXLOFPBaGOgTgSproEydR7xuur9ikD688ADx0hUXHKLO8TGfpvnK4WwZC5u247LVgO6kPMRD2BHihWUnwWebHNWpyz5Y9U1l8Y3Re96oMhYGI3ID5ZGS2AYaTVBL+Bfq+UrzWQRu1eAWbaI3XHhSSgNEw+l1yEM3mI4OMRfYgX knursimu@ONM-KNURSIMU-01