Merge "Fix volume mountpoint - read from configuration file"