Squashed a few commits to make pulling in changes a little more simple.

Change-Id: I8421093f0952d5e3ef287bfd4979cc5a83af6c09
Squashed a few commits to make pulling in changes a little more simple.

Change-Id: I8421093f0952d5e3ef287bfd4979cc5a83af6c09
Merge branch 'bp/db-repositories' of github.com:interminator/octavia into bp/db-repositories

Conflicts:
	octavia/db/repository.py
	octavia/tests/unit/db/test_models.py
	octavia/tests/unit/db/test_repository.py