pbeast-00-06-12

Igor Soloviev

@isolov

5d4acb10 · Merge equal data on server coming from different sources. This fixes · Jul 11, 2016

Include fixes for ADAMATLAS-238 and ADAMATLAS-27[0-3]