Staging will reserve the larger of staging or app memory

[finishes #60536486]

Signed-off-by: Mark Rushakoff <mrushakoff@pivotallabs.com>
Auto-merge remote-tracking branch 'upstream/master'