controller.set_hidden_services_conf w/ working integ tests

Replaces all uses of non-standard configuration value names with the
HiddenService equivalent (e.g. ports => HiddenServicePort)

Fixes broken integration tests