Merge "barbican: fix path issue in service unitfile and missing dir"