Merge "Updated vROPs plugin for using Common plugin consumer"