Spring roo.1.3.1

Solving ROO-3574 and ROO-3566 issues on ROO project