Merge branch 'stable-2.6' into devel-2.6

* stable-2.6:
  Add utility to format dictionary as key=value strings
  Remove fixed FIXME
  QA: Support master-netdev and default NIC parameters
  QA: Do not pass "--bridge" to "gnt-cluster init"

Signed-off-by: Guido Trotter <ultrotter@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>