Ensuring puppet::self::client ssldir exists,

moving inclusion of puppetmaster::ssl to puppet::self:config for puppet::self masters

Change-Id: I26757c91477adec003a5069282c9f0d8faddb36e
Merge "Ensuring puppet::self::client ssldir exists," into production