KNOX-309: Attempt to reparse topology files to recover from overlapping write
KNOX-308: Windows .cmd scripts not passing parameters to java correctly.
Merge remote branch 'origin/apache-ref/v0.4.0' into baikal-GA-0.4.0