Merge ovl_get_upper() and ovl_get_upperpath().

The resulting function is named ovl_get_upper(), though it still returns
upperpath as well.
Signed-off-by: NMiklos Szeredi <mszeredi@redhat.com>