AME-1294 code cleanup, renaming variable (and testing git)
AME-1294 code cleanup, no changes to logic
moved amserver/source into openam-core/src