Improve DBProfileEditor so hitting cancel doesn't throw an error
Merge remote-tracking branch upstream/$:{upbranch}