[openstack-sahara/f21] (3 commits) ...rebase to stable icehouse 2014.1.1

[Pádraig Brady]

Summary of changes:

  ff847f8... prepare for standard RDO github patch management (*)
  33e6404... prepare for standard versioning scheme (*)
  8e88e74... rebase to stable icehouse 2014.1.1 (*)

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