Replace +,- chars with _ in ferm defs

Turns out the + and - characters are not allowed in ferm rules, so
substituting them with _

Change-Id: I4fa49dd8818300239aca10218f4e52e5fe620261