Bug 1078882: Now that puppet 3.7.0 has landed OSX 10.10 can be happy; r=dustin

Here are a few tweaks to get 10.10 working with toplevel::base
Merge default -> production