de-macroize ucb ftpcontent, ftpcontentprovider

Change-Id: I61919d79ab847273d90c2845ae37f7edc4aa5044