API+Admin API: Fix SSL options

Change-Id: I9666789fb1e443d006b6c30747313eaf7642e69d
Merge "API+Admin API: Fix SSL options"