Fixing a bug in expanderb.rb.
Also avoiding syntax error on -%>  closing tags.

Change-Id: I9077cc3e89bdb5a240397b3aabad35c17343848e
Merge "Fixing a bug in expanderb.rb. Also avoiding syntax error on -%>  closing tags." into production