Fix for upstream db change & py26 issue

* neutron commit 9bf0e6654480f98f2315a43687b267263a82a823 removed
helper methdods from neutron.db.api.
* py26 does not have dict comprehensions.