Merge from branch 3.0.x and verify CORE-1645

This merges from branch 3.0.x to master.
It reverts the revert again... so that for the update change "where" is used instead of "whereClause".

See: https://liquibase.jira.com/browse/CORE-1645 
and the corresponding pull request for the branch: https://github.com/liquibase/liquibase/pull/209