Merge remote-tracking branch 'yishaih/fcs'

Multiple conflicts with timestamp support.  Hand resolved.

Signed-off-by: Doug Ledford <dledford@redhat.com>