Merge "The software FLAC encoder now properly signals an error if client" into jb-mr2-dev