Merge "joid: add more ram to orange pod2 bootstrap" into stable/brahmaputra