Merge "Adding ResellerAdmin role" into release/proposed/2019.2.0