LBaaS: add status field to PoolMonitorAssociation table

also fixes branch in migrations

Fixes bug 1166395

Change-Id: I451603cf152d84c750edb6fb1da59b4c7563cbce
Followup fixes to FWaaS API patch

Fixes: bug #1206620

This adds the minor fixes which were suggested be fixed
as a followup to the FWaaS API patch.

Change-Id: I8112dcb4f750bb367dcc6464cda7a826b7be811e
Imported Translations from Transifex

Change-Id: Ib153df117f394e605d8571acc0b68240ee7ac722
Fix docstring to reflect what the method actually does.

Change-Id: If36aa375de718f45620c7cae439656562b87c6e7
Merge "Followup fixes to FWaaS API patch"
Merge "Imported Translations from Transifex"
Merge "Fix docstring to reflect what the method actually does."
Merge "LBaaS: add status field to PoolMonitorAssociation table"