fix log string in conversion type

By using 'grep -rn "%([a-zA-Z_]*) "', we could find all cases of
'%(variable)'. And we need add an 's' like '%(variable)s'.

Closes-Bug: #1220557
Change-Id: Ib28b7ddc5e5aabe2b82a499d9c242c1982e7f953
Fixes pep8 violation in nova

This patch fixes a simple pep8 violation
that nova complains about.

Fixes Bug #1223046

Change-Id: I6f06939e3729b64fcefc5cdb20da05e7d3172be5
Fix Qos Specs association corner case

Fix a corner case in associating QoS Specs with Volumt types that was
not handled well: Raise HTTPBadRequest() to client if associate volume
type, which is already associated one qos specs other than specified
qos specs.  Previously such operation will proceed without error which
results overwriting original association.

Also refactor DB API volume_type_qos_specs_get() to return qos specs
in consistent dict format as other qos specs related APIs.

Fix bug: # 1222692

Change-Id: I9db66d1e3a7469620ba542f5387422685a2d828f
Merge "fix log string in conversion type"
Merge "Fix Qos Specs association corner case"