Updates to support building Zenoss from source.
Working with salty-vagrant and masterless.