Update Features module to v2

Update the features module to version 2 and remove reference to patch as
version 2 includes previous patch.