consistency change from name to id for comparisons.
system property changed from userName to user.name
Merge pull request #103 from unwin/2014.08_FB_5133

stas fix + username fix part 2