Merged flavor_swap extension into core API

Partially implements blueprint nova-v3-api

Change-Id: Ib58afac2159b25a38165882375e6d6ac57dc6da5
fix invalid logging

Logging parameters were passed as a tuple, yielding:
TypeError: not enough arguments for format string

fixes bug 1194917

Change-Id: Ifec893e1e4551f28849b96c7b1bf3c929b708b4d
Merge "Merged flavor_swap extension into core API"
Merge "fix invalid logging"
Merge remote-tracking branch 'm_src_repo/citrix-fixes' into build-temp