Changed the diploma supplement related classes to address a series of bugs. This mirrors fenix's 3.14.x branch merges #606, #608 and #609.