Accepts integer/float string with units and raises when unit is ambiguous (2)
Supersedes #21384.

- [x] closes #12136
- [x] tests added / passed
- [x] passes `git diff upstream/master -u -- "*.py" | flake8 --diff`
- [x] whatsnew entry