Sync up changes from puppet01-eu