Automatic merge from submit-queue Adjust memory limit for heapster's pod nanny cc @piosz @wojtek-t @zmerlynn