Keystone changes in puppet-neutron for [CFNR-158]

Signed-off-by: Bilal Ahmad <bilal@plumgrid.com>
Merge pull request #9 from plumgrid/bilal-dev-CFNR158

Keystone changes in puppet-neutron for [CFNR-158]
Increased neutron_url_timeout for SOL-260
Signed-off-by: Bilal Ahmad <bilal@plumgrid.com>
Merge pull request #10 from plumgrid/bilal-dev-SOL260

Increased neutron_url_timeout for SOL-260
Merge branch 'automaton' into salmankh-automaton-dev