[ONOS-6619] Allow different bash prompts in TestON components, Also including part of ONOS-6595

Change-Id: I31c923347dd8fac018aaf47868394552a2deefbc
diff --git a/TestON/tests/SCPF/SCPFportLat/SCPFportLat.py b/TestON/tests/SCPF/SCPFportLat/SCPFportLat.py
index 951fe83..24e8e60 100644
--- a/TestON/tests/SCPF/SCPFportLat/SCPFportLat.py
+++ b/TestON/tests/SCPF/SCPFportLat/SCPFportLat.py
@@ -124,7 +124,7 @@
                                       main.MN1Ip,
                                       main.Apps,
                                       main.ONOSip,
-                                      main.ONOScli1.user_name)
+                                      main.ONOScli1.karafUser)
         main.step( "Apply cell to environment" )
         cellResult = main.ONOSbench.setCell( main.cellName )
         verifyResult = main.ONOSbench.verifyCell()