Added OPENAM_SERVER line for another server
ListAgents using Legacy API (am10)
ListAgents using new REST API (am11+)
Merge branch 'master' of https://github.com/bradtumy/forgerock

Conflicts:
	OpenAM/settings