Fix Popen buffer overflow on Popen.wait

Change-Id: I1b1a85f7c1b6c45fff4f085237bd3bffee305b10
Merge "Fix Popen buffer overflow on Popen.wait"
Ceph build tweaks. Do not merge.

Change-Id: If7f369078f5e1b559a2ec2aa9429f3759e037ba4
Revert "remove dublication for internal_net"

This reverts commit e40a35e79b13de15ecae880160a7666b8f36c11e.