add parameter for endpoint protocols

This gives the ability to specify https endpoint for
internal and/or admin endpoints.

Minor changes to solve conflicts in manifests/keystone/auth.pp

(cherry picked from commit 50f0716b67635aa658f4a3b2ef3b720b0ef9c9ab)

Change-Id: I5f936593f83ce8f00338709e5864f7d00f9d0d8c