Applied fix from trunk for revision: 1849931 === Improved: Token Based Authentication (OFBIZ-9833) Just few typos and import ordering while reviewing for OFBIZ-4361