introduce special license class to deal with possible license parameter
naming conflict
fix remark, no return needed
Merge pull request #569 from stdweird/legacy_license_parameter

deal with legacy usage of license parameter