The boroughs of Liverpool, Knowsley, St Helens and Sefton were included in Merseyside. Besides Greater Manchester, to what other county was a part of Oldham incorporated into?