[master/rhel7-branch] Fix vncpasswd handling