Support removeVariable for Hibernate Datasource
* Replace instead of merge variable attributes and categories on save
* Support removeVariable for Hibernate Datasource
Merge branch 'dev'