Tagging of WPS following merge of tags/hwrf-20120312-1737 into the trunk.