Fixup Coding Style

I run a few more Coding Style tests, so here it goes few fixes due recent changes.

I removed few skip flags since the tests are passing and the bt5 are under use on some projects (SlapOS Master).