Approved by the OpenStack Board Dec 2014

Change-Id: I87c9417f2173fee4c6703b8bfdeca75af736b8fa