Issue 516: Updated initial commit
Fixed checkstyle warnings
Issue-545 MkContentsTest.updatesFile() test fixed.
Merge pull request #788 from sanai56967/516

#788: pull request Issue 516: Updated initial commit
Merge pull request #792 from aistomin/Issue-545

#792: pull request Issue-545 MkContentsTest.updatesFile() test fixed.
Merge remote-tracking branch 'upstream/master'