Merging the following plugin chagnes to 2.x plugin branch:

TRINIDAD-1583
TRINIDAD-1677
TRINIDAD-1679
8 files changed