Merge branch 'pr_nbi' into 'develop'

Resolve "[UBI] NBI to format config rules for services and devices"

See merge request !413