Evaluate Optional use

[Zarquan]

Our use of Optional is inconsistent.
In theory Optional is a nice thing, but it does not work well with generics.
In some cases we return an Optional, in other cases we unwrap the JPA result and just return null.

        if (optional.isPresent())
            {
            return optional.get();
            }
        else {
            return null;
            }