Cosmetics
Fix lookup split for system properties and environment variables
Switch between OpenJPA and EclipseLink