Save base and target release state correctly

If there are both a neutron and neutron_ml2 database, saving state
would fail in both save-state and grenade.sh.

neutron databases were being saved to BASE not TARGET_RELEASE
in grenade.sh

ceilometer databases were not being saved in grenade.sh

Clean up some whitespace.

Change-Id: I638c6923af65ad612d1329c8c25f534bfdad2d02
Closes-bug: 1358332
Merge "Save base and target release state correctly"