[DO NOT MERGE] Initial commit of refactor. Still contains old code.

broker_virtual_ip_address shouldn't be needed for OSE installs