changes for 1.6.0 release prep
updated VERSION file
updated VERSION file for trunk