Drop in new set of gridcentric patches

(refreshed from gridcentric's 1.4.0-rc1 set)

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>