resource_data saved unencrypted

Sqlalchemy is commiting unencrypted
data when a session commit happens after
doing a resource_data_get.

Closes-Bug #1233337
Change-Id: I9d20bf1faaf12cc1427976bf1223d4dfc9392c5f
It is necessary to update pool_id for Neutron LB

Closes-Bug: 1235903
Signed-off-by: Stephen Gran <stephen.gran@guardian.co.uk>
Change-Id: Ie48312efd7f04c425436b8dae9c8bccf21dc768e
Merge "resource_data saved unencrypted" into milestone-proposed
Merge "It is necessary to update pool_id for Neutron LB" into milestone-proposed