fixed several pep8 issues

  * E111 indentation is not a multiple of four
  * E113 unexpected indentation
  * E122 continuation line missing indentation or outdented
  * E128 continuation line under-indented for visual indent

Change-Id: I91babf85fd190849e3ee3272c7890d670c279e02
add docs on v2 & v3 support in the service catalog

Change-Id: I36f216f584bf71e22aef2af7ea912bb303544d56
bp: document-v2-to-v3-transition
Merge "fixed several pep8 issues"
Merge "add docs on v2 & v3 support in the service catalog"