Merge branch 'asf-site' of ssh://asterix-gerrit.ics.uci.edu:29418/incubator-asterixdb-site into asf-site