10.0 backport xunnel account

Miguel Ruiz requested to merge vauxoo-dev/xunnel-account:10.0-backport-xunnel-account into 10.0 Jun 28, 2018