Dont make lineout unavailable when plugging in headphones
requested to merge tanuk/pulseaudio:dont-make-lineout-unavailable-when-plugging-in-headphones into master
The first patch is a simple fix for #583 (closed), but the second patch is needed also to not cause a regression related to automatic switching to headphones.