Guava 15 compatability fixes

Static factory methods have moved: Ranges -> Range and DiscreteDomains
-> DiscreteDomain
Merge branch 'mbst-7010-nitro' into stage

* mbst-7010-nitro:
  Guava 15 compatability fixes