CLC-3317 Handle more course credit code and PNP flag combinations

And fix some current logic.

https://jira.ets.berkeley.edu/jira/browse/CLC-3317

When possible, checked the logic against grade transcripts from 2011-2013.