Merge "Clarifications to OpenStack gaps"