Minor refactoring due to change in the library model
CORRESPONDING LIBRARY CHANGE: https://git.opendaylight.org/gerrit/#/c/5112

Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
Change-Id: Ic08bbc22cf93c574f3ca029619e1b3b9d217c69e