HCOLL-134  ( release draft cut of the code so that I can test it across my network ) and commented out java 8 code in test so we can use java 7
Merge remote-tracking branch 'origin/master'