This patch enable barbican again and use the authtoken class Change-Id: I7327882c6188d23e2a9f65a2c026652b5a4d3c5d