Merged in -sdn-/pidgin (pull request #315)

Various build fixes for default branch

Approved-by: Eion Robb
Approved-by: Gary Kramlich
Approved-by: Elliott Sales de Andrade