Improve the decorator for manufacturing/order/facility component for re-use https://issues.apache.org/jira/browse/OFBIZ-6923