Make the sql locations configurable, adjust maven timeout
Merge branch 'master' of github.com:nigelb/puppet-52north-SOS