Merge branch 'stable-2.8' into stable-2.9

* stable-2.8
  DRBD parser: consume initial empty resource lines
Signed-off-by: Klaus Aehlig <aehlig@google.com>
Reviewed-by: Petr Pudlak <pudlak@google.com>

src/Ganeti/Storage/Drbd/Parser.hs

@@ -114,6 +114,7 @@ versionInfoParser = do
 -- | The parser for a (multi-line) string representing a device.
 deviceParser :: [DrbdInstMinor] -> Parser DeviceInfo
 deviceParser instMinor = do
+  _ <- additionalEOL
   deviceNum <- skipSpaces *> A.decimal <* A.char ':'
   cs <- skipSpacesAndString "cs:" connStateParser
   if cs == Unconfigured