BUG-731: fix order of modifiers

'abstract protected' -> 'protected abstract' et al.

Change-Id: Id124ddc8281a5f880b9cd5b1e1b2de5a6722b391
Signed-off-by: Robert Varga <rovarga@cisco.com>
Merge "BUG-731: fix order of modifiers"