Bring in shelving fixes and correct workflow-service via gem updates