Better place for PNG_INCLUDE_DIR in the patch.
Minor bumps for Samba4:
  * Improve krb5-config, it IS actually being called, but in
    another configuring stage.
  * It's better to break with 4.0.5 than with 4.0.4.