CLC-3317 Handle more course credit code and PNP flag combinations
And fix some current logic.