rhbz1066756 - Fix functional tests after merging with latest master.