start over from scratch for WEB-8848, and this time use replace +review WEBCR-189
use UNIX_TIMESTAMP() everywhere for WEB-8848 +review WEBCR-189
merge trunk to branch for WEB-8850 +review WEBCR