Added new bug fixes and bumped version for diablo.
Added new bug fixes and bumped version for diablo.

pmo-trunk-r3482

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