Automatic build path fixes

Merged Adam Knapp requested to merge auto-build-fix into master

Signed-off-by: Adam Knapp adam.knapp@ericsson.com

Merge request reports