Addendum for client side changes TEZ-607. Client DAG AM communication broken for token based security (bikas)