Merge "Federated authentication via ECP functional tests"