Qatar and Bahrain have agreed to encourage the free movement of workers between the two states, which settled a land dispute in March.