Merge generic file replacement patch; Get library paths right on Trusty