Fixed code post-merge to support Java 6 and liquibase 3.3