[MERGE] Merge branch 'stable-2.13' into stable-2.14

['Petr Pudlak' via ganeti-devel]

commit 177a4e416f283e5e242e58e1b65f59cedb7b6d2b
Merge: f21bdec aea1dc1
Author: Petr Pudlak <pud...@google.com>
Date:   Mon Aug 10 10:47:32 2015 +0200

    Merge branch 'stable-2.13' into stable-2.14
    
    * stable-2.13
      (no changes)
    
    * stable-2.12
      Accept allocation of 0 jobs
      Return multiple fields multiple times
      In queries collect all needed data
      Add a function computing the filter arguments
      Utils: Add ordNub
      Accept timeout errors are luxi down
      Correct indendation
      In confd provide proper serial number
    
    * stable-2.11
      (no changes)
    
    * stable-2.10
      Add a new unit test for LUInstanceMultiAlloc
      Fix a bug in LUInstanceMultiAlloc LU