[calc] Use internal calculator implementation
[core] Add missing parameter to cap_req
Merge branch 'master' of github.com:embolalia/willie