Minor tweaks to base types to be compatible with FR Commerce rules setting display
Merge remote branch 'origin/7.x-4.x' into 7.x-4.x