The British government and Northern Ireland’s Prison Officers Association have resolved their long-running dispute over security measures.