Updated server part to include config changes in version 0.20.2
Changed rest_transport_uri behavior

Server config parameter rest_transport_uri is enabled by default and set
to "http://${::ipaddress_eth0}:12900/"
Changed rest_listen_uri to "http://${::ipaddress_eth0}:12900/"
Merge branch 'master' into migration_0.20.2

Conflicts:
	manifests/server.pp
	manifests/server/configure.pp
	templates/server.conf.erb