Fix for issue 2433

Makes secbot assemblies deconstructable until the baton is added.
Nitpicked 2433 fix
Merge pull request #2672 from QualityVan/master

Secbot deconstruction + issue 2433