Consolidated only

Progress PR, do not merge yet.

The changes are complete but require review.

Unit tests need to be updated to match new functions.
No floatingip.*.start events have been observed, but they are theoretically possible.