[fix] Reverting API breakage from the last merge

The last merge changed the API visual style to increase readability.

The manual merging was not done in a proper way however, and some of the
changes from its previous merges were reverted. This commit fixes this.
13 jobs from 28-tests-are-too-permissive-master-broken in 6 minutes and 55 seconds (queued for 33 seconds)
Status Job ID Name Coverage
  Build
passed #17758
integration
containers.build

00:00:03

passed #17759
integration
libnrm.build

00:00:01

passed #17760
integration
nrm.build

00:00:10

 
  Test
passed #17766
integration
Hello.test

00:00:11

passed #17767
knl
KNL-Hello.test

00:00:44

passed #17765
knl
KNL-Listen.test

00:00:46

passed #17763
knl
KNL-Perfwrapper.test

00:00:46

passed #17761
knl
KNL-Power.test

00:00:43

passed #17768
knl
KNL-STREAM.test

00:00:45

passed #17764
integration
Listen.test

00:00:12

passed #17762
integration
Perfwrapper.test

00:00:12

passed #17769
rapl
py.test

00:01:09

 
  Style
passed #17770
flake8

00:01:07