Merge branch 'devel-2.5'

* devel-2.5:
  Fix wrong option names in QA and cluster-merge
  Bump version to 2.5.0~rc5, update NEWS
  Add UnescapeAndSplit unittest for multi-escapes
  Fix a bug in command line option parsing code
  cli: Disable abbreviation matching for options
  Bump version to 2.5.0~rc5, update NEWS
  Add UnescapeAndSplit unittest for multi-escapes
  Fix a bug in command line option parsing code

Conflicts:
	lib/cli.py: Trivial

Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>

diff --cc NEWS
Simple merge

diff --cc configure.ac
Simple merge

diff --cc lib/cli.py
index 282abad,95bca46..a920fb0
--- 1/lib/cli.py
--- 2/lib/cli.py
+++ b/lib/cli.py
@@@ -29,7 -29,7 +29,8 @@@ import tim
  import logging
  import errno
  import itertools
 +import shlex
+ import optparse
  from cStringIO import StringIO
  
  from ganeti import utils
@@@ -1473,19 -1333,13 +1474,19 @@@ def _ParseArgs(argv, commands, aliases
  
      cmd = aliases[cmd]
  
 +  if cmd in env_override:
 +    args_env_name = ("%s_%s" % (binary.replace("-", "_"), cmd)).upper()
 +    env_args = os.environ.get(args_env_name)
 +    if env_args:
 +      argv = utils.InsertAtPos(argv, 1, shlex.split(env_args))
 +
    func, args_def, parser_opts, usage, description = commands[cmd]
-   parser = OptionParser(option_list=parser_opts + COMMON_OPTS,
-                         description=description,
-                         formatter=TitledHelpFormatter(),
-                         usage="%%prog %s %s" % (cmd, usage))
+   parser = CustomOptionParser(option_list=parser_opts + COMMON_OPTS,
+                               description=description,
+                               formatter=TitledHelpFormatter(),
+                               usage="%%prog %s %s" % (cmd, usage))
    parser.disable_interspersed_args()
 -  options, args = parser.parse_args()
 +  options, args = parser.parse_args(args=argv[1:])
  
    if not _CheckArguments(cmd, args_def, args):
      return None, None, None

diff --cc lib/utils/text.py
Simple merge

diff --cc qa/qa_cluster.py
Simple merge

diff --cc qa/qa_instance.py
Simple merge

diff --cc test/ganeti.utils.text_unittest.py
Simple merge