#932 equipment availability fix

resolves #932 on `master`, including renewal length issue

<!---
@huboard:{"order":505.125}
-->