[openstack-tempest/f20] Rebase to upstream -20141201 tags

[slinabery]

Summary of changes:

  cab3d16... Rebase to upstream -20141201 tags (*)

(*) This commit already existed in another branch; no separate mail sent