Merge branch 'stable-2.12' into stable-2.13

['Niklas Hambuechen' via ganeti-devel]

commit f5d4258be757f8eab1a26b7f52afddb9c92d2936
Merge: 1ae0c2f fa37a4f
Author: Niklas Hambuechen <nikl...@google.com>
Date:   Mon Nov 24 13:41:17 2014 +0100

    Merge branch 'stable-2.12' into stable-2.13

    * stable-2.12
      Fix hlint warnings found by hlint 1.9.11
      Make watcher identify itself on disk activation

    Signed-off-by: Niklas Hambuechen <nikl...@google.com>