Adding MR 148 and commit abd0961a made to master

This MR adds commit_abd0961af3d3c02e93d9cc3aa00d701d82917fde made to master, which reflects an idq-related commit made to the O3b_online branch but was not put in master. This MR also adds MR148 which fixes the path handling issues.