zsh:tmux: re-synced changes from office for zsh and tmux

Signed-off-by: Ratheesh S <ratheesh-soma.reddy@broadcom.com>