NEON-900 moving metadata to in use in-memory implementation
checkstyle cleanup after merge