Applying Felix Müller's patch from LANG-462 to fix a timezone assumption in a test and remove Java 6 interface implementation @Override statements