ControllerAdvice basePackages specifically refer to actual packages (avoiding accidental prefix matches with other packages)

Issue: SPR-12509
Upgrade to JUnit 4.12

Issue: SPR-12511