Fixes variation data being overridden by original values on resave.
Removes user save on named searches since we're not persisting those any more.
Merge branch 'release/2.0'

Conflicts:
	db/src/main/java/com/psddev/cms/tool/SearchResultRenderer.java
Merge branch 'master' of github.com:perfectsense/brightspot-cms