DC2B-33: AAF integration

Implement AAF integration for production and qa
Leave openID authentication for development