Compiling problems in rosetta 2016.20

Hello, everyone!

I have some problems while compiling rosetta_src_2016.20.58704 source code both in my desktop and cluster.
Compilers: gcc 6.1.1 & gcc 4.9.3
Compiling with make:
./make_project.py all
cd build_release
cmake ./
make -j 8

First problem (as in several previous sources) is "misleading-indentation" in src/ObjexxFCL/FArray.hh:637:34 (compiling with gcc 6.1.1).
It can be fixed by disabling 'Werror' in build.settings.cmake or by adding missed indent in FArray.hh
It's look like that code formatters do not recognize and fix that indent (I checked astyle).

[  2%] Building CXX object CMakeFiles/ObjexxFCL.dir/work/psp_builds/rosetta_src_2016.20.58704_bundle/main/source/src/ObjexxFCL/Time_Date.cc.o
[  3%] Building CXX object CMakeFiles/ObjexxFCL.dir/work/psp_builds/rosetta_src_2016.20.58704_bundle/main/source/src/ObjexxFCL/char.functions.cc.o
In file included from /work/psp_builds/rosetta_src_2016.20.58704_bundle/main/source/cmake/build_release/../../src/ObjexxFCL/FArray1.hh:20:0,
                 from /work/psp_builds/rosetta_src_2016.20.58704_bundle/main/source/src/ObjexxFCL/Time_Date.cc:16:
/work/psp_builds/rosetta_src_2016.20.58704_bundle/main/source/cmake/build_release/../../src/ObjexxFCL/FArray.hh: В функции-члене «virtual ObjexxFCL::FArray< <параметр-шаблона-1-1> >& ObjexxFCL::FArray< <параметр-шаблона-1-1> >::clear()»:
/work/psp_builds/rosetta_src_2016.20.58704_bundle/main/source/cmake/build_release/../../src/ObjexxFCL/FArray.hh:637:3: ошибка: this «if» clause does not guard... [-Werror=misleading-indentation]
   if ( owner_ ) delete[] array_; array_ = 0;
   ^~
/work/psp_builds/rosetta_src_2016.20.58704_bundle/main/source/cmake/build_release/../../src/ObjexxFCL/FArray.hh:637:34: замечание: ...this statement, but the latter is misleadingly indented as if it is guarded by the «if»
   if ( owner_ ) delete[] array_; array_ = 0;
                                  ^~~~~~
[  3%] Building CXX object CMakeFiles/ObjexxFCL.dir/work/psp_builds/rosetta_src_2016.20.58704_bundle/main/source/src/ObjexxFCL/format.cc.o
cc1plus: все предупреждения считаются ошибками
make[2]: *** [CMakeFiles/ObjexxFCL.dir/build.make:351: CMakeFiles/ObjexxFCL.dir/work/psp_builds/rosetta_src_2016.20.58704_bundle/main/source/src/ObjexxFCL/Time_Date.cc.o] Ошибка 1
make[2]: *** Ожидание завершения заданий…
make[1]: *** [CMakeFiles/Makefile2:7355: CMakeFiles/ObjexxFCL.dir/all] Ошибка 2
make: *** [Makefile:84: all] Ошибка 2

Second problem is "src/devel/svn_version.cc:19:30: fatal error: utility/version.hh: No such file or directory".

[ 97%] Building CXX object CMakeFiles/devel.dir/nfs/hybrilit.jinr.ru/user/p/poluyans/rosetta_src_2016.20.58704_bundle/main/source/src/devel/svn_version.cc.o

/nfs/hybrilit.jinr.ru/user/p/poluyans/rosetta_src_2016.20.58704_bundle/main/source/src/devel/svn_version.cc:19:30: fatal error: utility/version.hh: No such file or directory
 #include <utility/version.hh>
                              ^
compilation terminated.
make[2]: *** [CMakeFiles/devel.dir/nfs/hybrilit.jinr.ru/user/p/poluyans/rosetta_src_2016.20.58704_bundle/main/source/src/devel/svn_version.cc.o] Error 1
make[2]: *** Waiting for unfinished jobs....
make[1]: *** [CMakeFiles/devel.dir/all] Error 2
make: *** [all] Error 2

I have checked that utility/version.hh actually exists. Any suggestions to avoid that?

Thanks