Improve healthcare in prisons within two years, Health Committee tells Scottish Government