Merge ASK 6.0.0

Ran libtoolize, autoreconf and make distclean in cmm and fci/lib.

A few changes had to be made to make it compile and run.

Change-Id: I1eec7dc501dca1be4382305305650f1a4735b060