JBTIS-287 - correct discovery for Luna
JBTIS-287
JBTIS-287 - correct for luna
Merge pull request #207 from pleacu/JBTIS-287

Jbtis 287