US3350 - Improve capability extension

More fixes that clean up the codebase

Fix caching issues in plan controller, handle new attributes, revert to
correct version of Rails model lookup code (caused Cartridge.prefix to be
reset)

Include: https://github.com/openshift/li/pull/851

[merge]