Merge branch 'salmankh-dev', remote-tracking branch 'origin'
Merge branch 'salmankh-dev', remote-tracking branch 'origin'
Added enable_plumgrid parameter to make things more generic.

Signed-off-by: salmank <salmank@plumgrid.com>