Cleanup functest and undo old patch

Conf files used by different functests were duplicated.
If they needed to be modified (for example, to add new options for
object expiration), they had to be modified at several places.

* added object expirer config that were missing.
* Undid http://review.gluster.org/6444
  which was no longer required.

Change-Id: I601b0dd8fdb10520f81523d8e292e944b34e28ce
Signed-off-by: Prashanth Pai <ppai@redhat.com>
Merge "Cleanup functest and undo old patch" into icehouse