Convert MemTotal found in /proc/meminfo to bytes
Merge branch 't_239_es_memory' into develop
Merge branch 'develop'