S2 CR14,15 CR Fixes: Uses empty class constructs for empty STI classes.
https://vinsol.atlassian.net/browse/CF-14
https://vinsol.atlassian.net/browse/CF-15