These changes allow me to set puppet::server::librarian_path to '/modules' and automatically handle the fact that librarian is putting my modules into /etc/puppet/environments/$env/modules/*.

This should be a noop change for people who don't use explicitly set this.