More comprehensive fix for changes in postgres and mysql services label
Merge pull request #32 from ramnivas/db-label-changes

More comprehensive fix for changes in postgres and mysql services label