* Apply patch from Dominique for bug #192 and #147
references #192
references #147
Merge branch 'develop' of https://github.com/osate/osate2-core.git into develop