Merge "Limit the systemconfig tags allowed to vendors" into pi-dev