Merge pull request #73 from markt-asf/EE4J_8

Fix broken EE4J_8 branch plus clean-up