This decouples the role more completely from the AIO
build default configuration in
Id87fab39c929e0860abbc3755ad386aa6893b151
which enables SSL termination at the HAProxy LB.
Variable naming should match what is in
Id87fab39c929e0860abbc3755ad386aa6893b151 to allow
the AIO configuration to enable external SSL termination.
And, bringing in changes from
I1c654501d0c8573734c52b9c20ba4b5713d667c1
that were missed.
Change-Id: I0fd26ec60f02e68688ea864d0d7880f73e6df780