Merge "Fixed platform dependant bugs in maven plugin"