[v3.4] #932 equipment availability issues

resolves #932 for v3.4; both the original catalog availability / validation issue and a subsequently discovered renewal issue were fixed.

<!---
@huboard:{"order":336.75}
-->

Probably, I'll open up a separate issue for that. Thanks for reviewing!