Fixed the framework, removed workaround
Merge branch 'cos7' of github.com:clearos/app-base into cos7