Merge "Bug 1950: Raise memory and permgen limits for featurs-test"