Move elasticsearch related files to common
Merge branch 'APD-287-BOZ' into develop