Merge "Various pep8/HACKING fixes for Cinder."

diff --cc bin/cinder-manage
index 19bb1d6ea55d296a6c7719d1040cf212d7ad0427,fb4b46a837c82cf0798b06f86c69ce3f196dfe32..cfd0c762125cfb563098e819b7f67f7f5c5471ac
--- 1/bin/cinder-manage
--- 2/bin/cinder-manage
+++ b/bin/cinder-manage
@@@ -58,11 -58,10 +58,11 @@@ import gettex
  import optparse
  import os
  import sys
 +import uuid
  
  from sqlalchemy import create_engine, MetaData, Table
- from sqlalchemy.orm import sessionmaker
  from sqlalchemy.ext.declarative import declarative_base
+ from sqlalchemy.orm import sessionmaker
  
  
  # If ../cinder/__init__.py exists, add ../ to Python search path, so that

diff --cc cinder/utils.py
Simple merge