Upstream our puppet-nfs branch that improves support for Debian 7+

Original created by @intrigeri on 9758 (Redmine)

To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information