Backport some gcf pgch changes.
Backport some gcf pgch changes.

tcmitchell/geni-portal,charliemeyer/geni-portal,charliemeyer/geni-portal,tcmitchell/geni-portal,tcmitchell/geni-portal,charliemeyer/geni-portal,tcmitchell/geni-portal,charliemeyer/geni-portal,charliemeyer/geni-portal,tcmitchell/geni-portal