Removed w17 tag, and commited new bug fixes for newer w17 release.
Removed w17 tag, and commited new bug fixes for newer w17 release.

pmo-trunk-r4446

community-ssu/modest,community-ssu/modest,community-ssu/modest,community-ssu/modest