Finally fixed #date-picker issue that would occasionally cause @diagnosis regresssion tests to fail
Update in prep.sh to include yiic cleanupaddress before Migrating
 Removed #tofix after re-testing big fixes