fix conflicts
fixed unit tests
lowered memory to 400 per appserver
lowered memory to 400 per appserver
lowered memory to 400 per appserver
Merge pull request #365 from nlake44/max-mem

Fixing conflicts for setting maximum memory