Merge branch 'Java-8'
Merge branch 'master' of https://github.com/BandwidthOnDemand/nsi-pce