Changes required to support downstream openstack reuse.
Resolved merge conflict.
security/openstack/index adjustment.
Patchset 3 updates.
Signed-off-by: Ron Stone <ronald.stone@windriver.com>
Change-Id: I981379d1dedcc2649a6035a0302ef8a838c35433
Signed-off-by: Ron Stone <ronald.stone@windriver.com>