kamctl: shift only when expecting more parameters for rpc command

(cherry picked from commit 8b1458e97270a4094085226dce1108d8ea5ca7af)
(cherry picked from commit c8b65f5f562db763b013ab945cba7caadb9f6535)
(cherry picked from commit 53ea4bc3c760637390ff0f51ce10e7c53be25240)

utils/kamctl/kamctl.rpcfifo

@@ -106,13 +106,13 @@ rpc_cmd()
 		CMD="${CMD}, \"params\": [${RPCVAL}"
 		RPCPARAMS="yes"
 	fi
-	shift
-	while [ -n "$1" ] ; do
-		rpcparamval "${1}"
-		CMD="${CMD}, ${RPCVAL}"
-		shift
-	done
 	if [ "$RPCPARAMS" = "yes" ]; then
+		shift
+		while [ -n "$1" ] ; do
+			rpcparamval "${1}"
+			CMD="${CMD}, ${RPCVAL}"
+			shift
+		done
 		CMD="${CMD}]"
 	fi
 	CMD="${CMD}, \"reply_name\": \"${name}\", \"id\": $$}\n"