Changes required to allow building on Eclipse Luna.

Tested by building against both Eclipse Kepler and Eclipse Luna.

Eclipse Luna (4.4) will be released at the end of this month (June 2014.)