remove pep8 E122 exemption and correct style

This change removes the E122 exemption for pep8. E122 is "continuation line missing indentation or outdented"

Change-Id: I4bd1e6c787648a3dfa69b514efeeff05996aabc1
Partial-Bug: 1329017
NSX: revert queue extension name change

The following patch: d7aa2dfcb14b84e2ef3242fb0787200d852d6103 renamed the
nvp-qos extension to qos-queue which breaks the integration with nova as
nova checks for the nvp-qos extension to be loaded and now it's called
qos-queue. This patch adds back nvp-qos for trunk chasers and another
patch will migrate nova from nvp-qos to qos-queue.

Change-Id: I563aed6b6c4551489989f846a619d54020d0b5ee
closes-bug: 1329071
Merge "NSX: revert queue extension name change"
Merge "remove pep8 E122 exemption and correct style"
Merge remote-tracking branch 'upstream/master' into ovx