Typically issues like this would be fixed on the 'master' branch first and then back-ported to any other branches to avoid regressions. Although the JMSServerManager is deprecated on 'master' I think this is still worth fixing there first and then back-porting it to the 1.x branch.
@jbertram Note that there is no JMSServerControlTest test on master branch, but it exists on 1.x. This test can be used to cover this issue against regression, how do you usually deal with these cases? will it be fine if, when this issue is cherry picked for 1.x, we add a new commit including the test case into the PR over 1.x?