Added User environment variables support in broker

Use x.present? instead of (not x.nil? and  not x.empty?)