From cae6f8fca3358b13303f4d8ab4643d94a7d92e83 Mon Sep 17 00:00:00 2001
From: Matt Apperson <me@mattapperson.com>
Date: Mon, 17 Dec 2018 16:50:03 -0500
Subject: [PATCH] [6.x][BeatsCM] Backport refactor fixes (#27034)

* wrap non error in a try/catch (#26898)

* [Beats CM] Add basic license type (#26935)