HCOLL-133 CloseablesManager.checkState is throwing java.lang.IllegalStateException
Merge remote-tracking branch 'origin/master'