FIxed bug in fifoadm with new pathes.
Merge branch 'test' into dev