803828 #3: need to import users::builder and buildmaster::settings if you refer to them
803828 #3: remove commented-out code
803828 #3: ${..} please (and several other places)
803828 #3: ${..} please (and several other places)
803828 #3: shouldn't this be  rather than ?
buf 803823 #3: This will be required automatically - no need to add it here