set ssl options for glance-api

lets you set the ssl cert, key, ca for secure api
connection.

Conflicts in manifests/api.pp solved.

Change-Id: Ie82a46eeca27897363273aab5e58fcf6f6fe1ae0
backport: havana
(cherry picked from commit e866507782dfc8c279f230a0b5223dd121a76277)
set ssl options for glance-registry

lets you set the ssl cert, key, ca for secure registry
connection.

Conflicts in manifests/registry.pp solved

Change-Id: Ic0ab88ef14ea61fd42b2bc1811ca1b5a4180b4a4
backport: havana
(cherry picked from commit 5182c5cd782e408192932a30ac03a21676ba7ba2)
Merge "set ssl options for glance-api" into stable/havana