Merge branch 'stable-2.6'

* stable-2.6: (26 commits)
  Bump version for beta 2 release
  Fix epydoc raises L{...} usage
  Fix race condition in test for *FileID functions
  Move KVM keymap from GenerateRuntime to ExecuteRuntime
  Add the keymap directory to the list of runtime KVM dirs
  Fix make -n use
  Enable hlint in lint and reorganise this target
  Improve error message for auto-promote/node modify
  Fix QA import of existing instances
  Remove one obsolete hlint override
  Fix prefix bug in Haskell ssconf implementation
  Move the ssconf file prefix constant to constants.py
  QA: Add configuration options for static MAC address
  QA: Ignore tags using regular expression
  Fix parallel build failures
  QA: Add default setting for tests
  QA: add toggle for fewer common instance tests
  QA: stop logging SSH arguments for each invocation
  Switch QA to tty-less mode
  Fix a type issue and bad logic in cluster verification
  ...

Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: René Nussbaumer <rn@google.com>